mutate() didn't work as advertised
Bug #7162705
Change-Id: I15b2663fa7f1c71a2a3479134b8b7f37bfcbc607
diff --git a/graphics/java/android/graphics/drawable/BitmapDrawable.java b/graphics/java/android/graphics/drawable/BitmapDrawable.java
index 7a4a1ca..e82ccd4 100644
--- a/graphics/java/android/graphics/drawable/BitmapDrawable.java
+++ b/graphics/java/android/graphics/drawable/BitmapDrawable.java
@@ -80,7 +80,6 @@
@Deprecated
public BitmapDrawable() {
mBitmapState = new BitmapState((Bitmap) null);
- mMutated = true;
}
/**
@@ -91,7 +90,6 @@
public BitmapDrawable(Resources res) {
mBitmapState = new BitmapState((Bitmap) null);
mBitmapState.mTargetDensity = mTargetDensity;
- mMutated = true;
}
/**
@@ -102,7 +100,6 @@
@Deprecated
public BitmapDrawable(Bitmap bitmap) {
this(new BitmapState(bitmap), null);
- mMutated = true;
}
/**
@@ -112,7 +109,6 @@
public BitmapDrawable(Resources res, Bitmap bitmap) {
this(new BitmapState(bitmap), res);
mBitmapState.mTargetDensity = mTargetDensity;
- mMutated = true;
}
/**
@@ -126,7 +122,6 @@
if (mBitmap == null) {
android.util.Log.w("BitmapDrawable", "BitmapDrawable cannot decode " + filepath);
}
- mMutated = true;
}
/**
@@ -139,7 +134,6 @@
if (mBitmap == null) {
android.util.Log.w("BitmapDrawable", "BitmapDrawable cannot decode " + filepath);
}
- mMutated = true;
}
/**
@@ -153,7 +147,6 @@
if (mBitmap == null) {
android.util.Log.w("BitmapDrawable", "BitmapDrawable cannot decode " + is);
}
- mMutated = true;
}
/**
@@ -166,7 +159,6 @@
if (mBitmap == null) {
android.util.Log.w("BitmapDrawable", "BitmapDrawable cannot decode " + is);
}
- mMutated = true;
}
/**
@@ -560,7 +552,6 @@
} else {
mTargetDensity = state.mTargetDensity;
}
- mMutated = false;
setBitmap(state != null ? state.mBitmap : null);
}
}
diff --git a/graphics/java/android/graphics/drawable/ColorDrawable.java b/graphics/java/android/graphics/drawable/ColorDrawable.java
index f8e3944..4561397 100644
--- a/graphics/java/android/graphics/drawable/ColorDrawable.java
+++ b/graphics/java/android/graphics/drawable/ColorDrawable.java
@@ -43,7 +43,6 @@
*/
public ColorDrawable() {
this(null);
- mMutated = true;
}
/**
@@ -54,7 +53,6 @@
public ColorDrawable(int color) {
this(null);
setColor(color);
- mMutated = true;
}
private ColorDrawable(ColorState state) {
diff --git a/graphics/java/android/graphics/drawable/GradientDrawable.java b/graphics/java/android/graphics/drawable/GradientDrawable.java
index 42be657..2ca54d4 100644
--- a/graphics/java/android/graphics/drawable/GradientDrawable.java
+++ b/graphics/java/android/graphics/drawable/GradientDrawable.java
@@ -124,7 +124,7 @@
private Paint mLayerPaint; // internal, used if we use saveLayer()
private boolean mRectIsDirty; // internal state
- private boolean mMutated = true;
+ private boolean mMutated;
private Path mRingPath;
private boolean mPathIsDirty = true;
diff --git a/graphics/java/android/graphics/drawable/NinePatchDrawable.java b/graphics/java/android/graphics/drawable/NinePatchDrawable.java
index 7a43496..2ee6233 100644
--- a/graphics/java/android/graphics/drawable/NinePatchDrawable.java
+++ b/graphics/java/android/graphics/drawable/NinePatchDrawable.java
@@ -77,7 +77,6 @@
@Deprecated
public NinePatchDrawable(Bitmap bitmap, byte[] chunk, Rect padding, String srcName) {
this(new NinePatchState(new NinePatch(bitmap, chunk, srcName), padding), null);
- mMutated = true;
}
/**
@@ -88,7 +87,6 @@
Rect padding, String srcName) {
this(new NinePatchState(new NinePatch(bitmap, chunk, srcName), padding), res);
mNinePatchState.mTargetDensity = mTargetDensity;
- mMutated = true;
}
/**
@@ -101,7 +99,6 @@
Rect padding, Rect layoutInsets, String srcName) {
this(new NinePatchState(new NinePatch(bitmap, chunk, srcName), padding, layoutInsets), res);
mNinePatchState.mTargetDensity = mTargetDensity;
- mMutated = true;
}
/**
@@ -112,7 +109,6 @@
@Deprecated
public NinePatchDrawable(NinePatch patch) {
this(new NinePatchState(patch, new Rect()), null);
- mMutated = true;
}
/**
@@ -122,7 +118,6 @@
public NinePatchDrawable(Resources res, NinePatch patch) {
this(new NinePatchState(patch, new Rect()), res);
mNinePatchState.mTargetDensity = mTargetDensity;
- mMutated = true;
}
private void setNinePatchState(NinePatchState state, Resources res) {