Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev

2016-08-24 17:27:07 +00:00
parent b2507eb7b7 66b3a0d1aa
commit 462f29f77f
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;
        }