Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix crash in ShapeDrawable" into jb-mr1-dev

Browse Source
This commit is contained in:
Romain Guy
2012-09-07 18:38:02 -07:00
committed by Android (Google) Code Review
parent 1ac44eb94d 1558cf1498
commit be6024d571
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
graphics/java/android/graphics/drawable/ShapeDrawable.java
View File

@@ -373,8 +373,16 @@ public class ShapeDrawable extends Drawable {
@Override @Override
public Drawable mutate() { public Drawable mutate() {
if (!mMutated && super.mutate() == this) { if (!mMutated && super.mutate() == this) {
mShapeState.mPaint = new Paint(mShapeState.mPaint); if (mShapeState.mPaint != null) {
mShapeState.mPadding = new Rect(mShapeState.mPadding); 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 { try {
mShapeState.mShape = mShapeState.mShape.clone(); mShapeState.mShape = mShapeState.mShape.clone();
} catch (CloneNotSupportedException e) { } catch (CloneNotSupportedException e) {