From 1010ac9b7c52b1e2a64e8e1f4dcdb4d79f4d32cc Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Mon, 10 Aug 2009 15:11:06 -0700 Subject: [PATCH] Fix possible NPE when mutating a DrawableContainer --- graphics/java/android/graphics/drawable/DrawableContainer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphics/java/android/graphics/drawable/DrawableContainer.java b/graphics/java/android/graphics/drawable/DrawableContainer.java index dc80cf5ac97f6..6b5040690dcbf 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; }