diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-10 15:12:04 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-10 15:12:04 -0700 |
| commit | 5d3b13150d126e6d7f04978f4b142900311758ed (patch) | |
| tree | 52ac2340841994f970378e36f15be5acfa0c0917 /graphics | |
| parent | 1f9ef9a2ccb5e2f11dc644c34710e70afe994fac (diff) | |
| parent | 1010ac9b7c52b1e2a64e8e1f4dcdb4d79f4d32cc (diff) | |
| download | frameworks_base-5d3b13150d126e6d7f04978f4b142900311758ed.zip frameworks_base-5d3b13150d126e6d7f04978f4b142900311758ed.tar.gz frameworks_base-5d3b13150d126e6d7f04978f4b142900311758ed.tar.bz2 | |
Merge change 20657
* changes:
Fix possible NPE when mutating a DrawableContainer
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/drawable/DrawableContainer.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/drawable/DrawableContainer.java b/graphics/java/android/graphics/drawable/DrawableContainer.java index dc80cf5..6b50406 100644 --- a/graphics/java/android/graphics/drawable/DrawableContainer.java +++ b/graphics/java/android/graphics/drawable/DrawableContainer.java @@ -237,7 +237,7 @@ public class DrawableContainer extends Drawable implements Drawable.Callback { final int N = mDrawableContainerState.getChildCount(); final Drawable[] drawables = mDrawableContainerState.getChildren(); for (int i = 0; i < N; i++) { - drawables[i].mutate(); + if (drawables[i] != null) drawables[i].mutate(); } mMutated = true; } |