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

Avoid potential re-entry as a result of child mutation

Browse Source 
Don't set the callback until we're all done making changes.

Bug: 30902893
Change-Id: Ia1560692a83ecb2c50f5e77fa4d1e8155a78a204
(cherry picked from commit b46ba3b2b0)
This commit is contained in:
Alan Viverette
2016-07-27 10:23:35 -04:00
parent e816f1f542
commit 66b3a0d1aa
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;
} }