Avoid potential re-entry as a result of child mutation

am: 66b3a0d1aa Change-Id: Ia4ece22b06ef087921e8c341ec7112fd271598f2
2016-08-24 17:37:51 +00:00
parent 263820bb2c 66b3a0d1aa
commit 387ebba861
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;
        }