Merge change 5142 into donut

* changes: Fix NPE in GradientDrawable constructor
2009-06-24 09:48:07 -07:00
parent eaa89f74c0 562bf17c6c
commit a2a60a2150
1 changed files with 3 additions and 1 deletions
--- a/graphics/java/android/graphics/drawable/GradientDrawable.java
+++ b/graphics/java/android/graphics/drawable/GradientDrawable.java
@@ -880,7 +880,9 @@ public class GradientDrawable extends Drawable {
            mShape = state.mShape;
            mGradient = state.mGradient;
            mOrientation = state.mOrientation;
-            mColors = state.mColors.clone();
+            if (state.mColors != null) {
+                mColors = state.mColors.clone();
+            }
            if (state.mPositions != null) {
                mPositions = state.mPositions.clone();
            }