commit 71c5b4497e8a25df20bb2531da972f5b2371073d
author Alan Viverette <alanv@google.com> Wed Jul 27 10:23:35 2016 -0400
committer gitbuildkicker <android-build@google.com> Thu Aug 25 09:20:51 2016 -0700
tree 45e909784ad9ea6995154cb212ebd70fbeef1e6b
parent c4d27e949190d0dda13807d445544793e58aeb6c

Avoid potential re-entry as a result of child mutation

Don't set the callback until we're all done making changes.

Bug: 30902893
Change-Id: Ia1560692a83ecb2c50f5e77fa4d1e8155a78a204
(cherry picked from commit b46ba3b2b0268688852cdf3d1fb4afe4873d63be)
(cherry picked from commit 66b3a0d1aa48d5d663dcad86468605c565bb1880)

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 d5143da..cc7f5c7 100644
--- a/graphics/java/android/graphics/drawable/DrawableContainer.java
+++ b/graphics/java/android/graphics/drawable/DrawableContainer.java
@@ -851,8 +851,8 @@
 
         private Drawable prepareDrawable(Drawable child) {
             child.setLayoutDirection(mLayoutDirection);
-            child.setCallback(mOwner);
             child = child.mutate();
+            child.setCallback(mOwner);
             return child;
         }