Avoid potential re-entry as a result of child mutation am: b46ba3b2b0

am: 0d98515cab Change-Id: I521833b5d599d735be786b6fb6a1b9fa7f2f2533
2016-07-27 22:52:07 +00:00
parent f770023beb 0d98515cab
commit 762c828704
1 changed files with 1 additions and 1 deletions
--- a/graphics/java/android/graphics/drawable/DrawableContainer.java
+++ b/graphics/java/android/graphics/drawable/DrawableContainer.java
@@ -851,8 +851,8 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {

        private Drawable prepareDrawable(Drawable child) {
            child.setLayoutDirection(mLayoutDirection);
-            child.setCallback(mOwner);
            child = child.mutate();
+            child.setCallback(mOwner);
            return child;
        }