commit 1558cf1498ecc687532f2dad3de720053dca9309
author Romain Guy <romainguy@google.com> Fri Sep 07 18:35:22 2012 -0700
committer Romain Guy <romainguy@google.com> Fri Sep 07 18:37:20 2012 -0700
tree 8a1e1dc5baae1736db5e973055d2327536d5174c
parent 7c0263204384cfa58183b9badcaccdac88efdf72

Fix crash in ShapeDrawable

Change-Id: Ibc277db46912a73dc3f971f8487baa5eafa8bc84

graphics/java/android/graphics/drawable/ShapeDrawable.java

diff --git a/graphics/java/android/graphics/drawable/ShapeDrawable.java b/graphics/java/android/graphics/drawable/ShapeDrawable.java
index a3622a2..2ec1293 100644
--- a/graphics/java/android/graphics/drawable/ShapeDrawable.java
+++ b/graphics/java/android/graphics/drawable/ShapeDrawable.java
@@ -373,8 +373,16 @@
     @Override
     public Drawable mutate() {
         if (!mMutated && super.mutate() == this) {
-            mShapeState.mPaint = new Paint(mShapeState.mPaint);
-            mShapeState.mPadding = new Rect(mShapeState.mPadding);
+            if (mShapeState.mPaint != null) {
+                mShapeState.mPaint = new Paint(mShapeState.mPaint);
+            } else {
+                mShapeState.mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+            }
+            if (mShapeState.mPadding != null) {
+                mShapeState.mPadding = new Rect(mShapeState.mPadding);
+            } else {
+                mShapeState.mPadding = new Rect();
+            }
             try {
                 mShapeState.mShape = mShapeState.mShape.clone();
             } catch (CloneNotSupportedException e) {