Avoid potential re-entry as a result of child mutation

am: b46ba3b2b0 Change-Id: I173c513ba82776f96ad05d1a5356b481f75b1040
2016-07-27 22:00:51 +00:00
parent 52724b497f b46ba3b2b0
commit 0d98515cab
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;
        }