Merge "Avoid potential re-entry as a result of child mutation" into nyc-mr1-dev (11fbe5ec) · Commits · e / os / android_frameworks_base

graphics/java/android/graphics/drawable/DrawableContainer.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}