Merge "Always mutate child when added to drawable container" into nyc-dev

1 files changed, 7 insertions, 1 deletions

diff --git a/graphics/java/android/graphics/drawable/DrawableContainer.java b/graphics/java/android/graphics/drawable/DrawableContainer.java
index 42f48633eacb..8971004f0f72 100644
--- a/graphics/java/android/graphics/drawable/DrawableContainer.java
+++ b/graphics/java/android/graphics/drawable/DrawableContainer.java
@@ -786,13 +786,19 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
             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);