From 102a6bff77c618112762245dbd798c8d7f6d44ea Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Thu, 26 Feb 2015 12:52:47 -0800
Subject: [PATCH] Propagate original Resources to DrawableContainer if no
 override set

Also fixes a double-add in ASLD.

Bug: 19498949
Change-Id: I9e7e0a0fb22a23518c80c1b099f8da0e0c1f53d8
---
 .../android/graphics/drawable/AnimatedStateListDrawable.java    | 2 +-
 graphics/java/android/graphics/drawable/DrawableContainer.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java b/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java
index 4af5946170db9..2c603e2d2cb8a 100644
--- a/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java
+++ b/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java
@@ -594,7 +594,7 @@ public class AnimatedStateListDrawable extends StateListDrawable {
                 mTransitions.append(keyToFrom, pos | REVERSED_BIT | reversibleBit);
             }
 
-            return addChild(anim);
+            return pos;
         }
 
         int addStateSet(@NonNull int[] stateSet, @NonNull Drawable drawable, int id) {
diff --git a/graphics/java/android/graphics/drawable/DrawableContainer.java b/graphics/java/android/graphics/drawable/DrawableContainer.java
index c4794d97fd2f5..434134a7eb059 100644
--- a/graphics/java/android/graphics/drawable/DrawableContainer.java
+++ b/graphics/java/android/graphics/drawable/DrawableContainer.java
@@ -685,7 +685,7 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
         DrawableContainerState(DrawableContainerState orig, DrawableContainer owner,
                 Resources res) {
             mOwner = owner;
-            mRes = res;
+            mRes = res != null ? res : orig != null ? orig.mRes : null;
 
             if (orig != null) {
                 mChangingConfigurations = orig.mChangingConfigurations;