From a24c9b4791dddc2dbc233dfe8dac1ae682beb272 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Fri, 6 May 2016 16:01:56 -0400
Subject: [PATCH] Always mutate child when added to drawable container

Bug: 28456908
Change-Id: I3e7bea85e056882a331aecf7e225134161e685e6
---
 .../java/android/graphics/drawable/DrawableContainer.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/graphics/java/android/graphics/drawable/DrawableContainer.java b/graphics/java/android/graphics/drawable/DrawableContainer.java
index 42f48633eacb5..8971004f0f72a 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);