summaryrefslogtreecommitdiffstats
path: root/graphics/java
diff options
context:
space:
mode:
authorRomain Guy <romainguy@android.com>2009-08-10 15:11:06 -0700
committerRomain Guy <romainguy@android.com>2009-08-10 15:11:06 -0700
commit1010ac9b7c52b1e2a64e8e1f4dcdb4d79f4d32cc (patch)
treeaed61339ba03a7e98e18f6cd9f2f189d262818e9 /graphics/java
parent07cbacc11705f1f05a1150083aad000c53942dea (diff)
downloadframeworks_base-1010ac9b7c52b1e2a64e8e1f4dcdb4d79f4d32cc.zip
frameworks_base-1010ac9b7c52b1e2a64e8e1f4dcdb4d79f4d32cc.tar.gz
frameworks_base-1010ac9b7c52b1e2a64e8e1f4dcdb4d79f4d32cc.tar.bz2
Fix possible NPE when mutating a DrawableContainer
Diffstat (limited to 'graphics/java')
-rw-r--r--graphics/java/android/graphics/drawable/DrawableContainer.java2
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;
}