commit 5d3b13150d126e6d7f04978f4b142900311758ed
author Android (Google) Code Review <android-gerrit@google.com> Mon Aug 10 15:12:04 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 10 15:12:04 2009 -0700
tree 52ac2340841994f970378e36f15be5acfa0c0917
parent 1f9ef9a2ccb5e2f11dc644c34710e70afe994fac
parent 1010ac9b7c52b1e2a64e8e1f4dcdb4d79f4d32cc

Merge change 20657

* changes:
  Fix possible NPE when mutating a DrawableContainer

graphics/java/android/graphics/drawable/DrawableContainer.java

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 @@
             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;
         }