commit a53d8aba8b02c4ac92f85790ee556e03a4f0b67e
author Alan Viverette <alanv@google.com> Fri May 06 16:01:56 2016 -0400
committer The Android Automerger <android-build@google.com> Mon May 09 17:29:50 2016 -0700
tree 34185b53aecbefe370a1214b6496fb52c3991b8d
parent fab41117a03da765c1424a68917db2e011e88bd5

Always mutate child when added to drawable container

Bug: 28456908
Change-Id: I3e7bea85e056882a331aecf7e225134161e685e6

graphics/java/android/graphics/drawable/DrawableContainer.java

diff --git a/graphics/java/android/graphics/drawable/DrawableContainer.java b/graphics/java/android/graphics/drawable/DrawableContainer.java
index 42f4863..8971004 100644
--- a/graphics/java/android/graphics/drawable/DrawableContainer.java
+++ b/graphics/java/android/graphics/drawable/DrawableContainer.java
@@ -786,13 +786,19 @@
             return mChangingConfigurations | mChildrenChangingConfigurations;
         }
 
+        /**
+         * Adds the drawable to the end of the list of contained drawables.
+         *
+         * @param dr the drawable to add
+         * @return the position of the drawable within the container
+         */
         public final int addChild(Drawable dr) {
             final int pos = mNumChildren;
-
             if (pos >= mDrawables.length) {
                 growArray(pos, pos+10);
             }
 
+            dr.mutate();
             dr.setVisible(false, true);
             dr.setCallback(mOwner);