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

Merge change 5718 into donut

Browse Source 
* changes:
  Fix NullPointerException in DrawableContainer.mutate()
This commit is contained in:
Android (Google) Code Review
2009-06-29 20:09:27 -07:00
parent 8561de157c 6be507cc66
commit 083928fefd
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -234,8 +234,10 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
@Override @Override
public Drawable mutate() { public Drawable mutate() {
if (!mMutated && super.mutate() == this) { if (!mMutated && super.mutate() == this) {
for (Drawable child : mDrawableContainerState.mDrawables) { final int N = mDrawableContainerState.getChildCount();
child.mutate(); final Drawable[] drawables = mDrawableContainerState.getChildren();
for (int i = 0; i < N; i++) {
drawables[i].mutate();
} }
mMutated = true; mMutated = true;
} }