Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2016-08-24 17:27:07 +00:00
committed by Android (Google) Code Review
parent b2507eb7b7 66b3a0d1aa
commit 462f29f77f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
graphics/java/android/graphics/drawable/DrawableContainer.java
View File

@@ -851,8 +851,8 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
private Drawable prepareDrawable(Drawable child) { private Drawable prepareDrawable(Drawable child) {
child.setLayoutDirection(mLayoutDirection); child.setLayoutDirection(mLayoutDirection);
child.setCallback(mOwner);
child = child.mutate(); child = child.mutate();
child.setCallback(mOwner);
return child; return child;
} }