diff options
| author | 2014-02-27 00:27:05 +0000 | |
|---|---|---|
| committer | 2014-02-27 00:27:05 +0000 | |
| commit | 257398378a12ed3208b1f9613ef1cf937acfa256 (patch) | |
| tree | c81e0b622a2a15b0877508098053cce40791dfcc | |
| parent | c2248715e3ca37a4dc91624b580d6b0503e0ad3e (diff) | |
| parent | 2cc13d0ef11a4dda0265c2348c6861ab74cab82e (diff) | |
Merge "Fix shape drawable constructor"
| -rw-r--r-- | graphics/java/android/graphics/drawable/ShapeDrawable.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/drawable/ShapeDrawable.java b/graphics/java/android/graphics/drawable/ShapeDrawable.java index 817c74f63f05..a680550da730 100644 --- a/graphics/java/android/graphics/drawable/ShapeDrawable.java +++ b/graphics/java/android/graphics/drawable/ShapeDrawable.java @@ -82,7 +82,7 @@ public class ShapeDrawable extends Drawable { private ShapeDrawable(ShapeState state) { mShapeState = new ShapeState(state); - if (state.mTint != null) { + if (state != null && state.mTint != null) { final int color = state.mTint.getColorForState(getState(), 0); mTintFilter = new PorterDuffColorFilter(color, state.mTintMode); } |