summaryrefslogtreecommitdiffstats
path: root/graphics/java
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2015-01-30 16:19:45 -0800
committerAlan Viverette <alanv@google.com>2015-01-30 16:19:45 -0800
commit7d6854a2292df70de284b490348770ad7c66d47b (patch)
treeabe2b113dab2275a0cfbaed0e781953e579c5ffe /graphics/java
parent84183103f4a9222ddbe22c7289f9627c74892d53 (diff)
downloadframeworks_base-7d6854a2292df70de284b490348770ad7c66d47b.zip
frameworks_base-7d6854a2292df70de284b490348770ad7c66d47b.tar.gz
frameworks_base-7d6854a2292df70de284b490348770ad7c66d47b.tar.bz2
Synchronize mutated constant state's drawable constant state
Mutating InsetDrawable's locally-held drawable alters its constant state, so we need to update the InsetDrawable's reference to match. This ensures that any drawables created using getConstantState().newDrawable() will match the mutated versions. Bug: 19213175 Change-Id: If9063bcc0942691a8940443e607f2dc722fc6e13
Diffstat (limited to 'graphics/java')
-rw-r--r--graphics/java/android/graphics/drawable/InsetDrawable.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/drawable/InsetDrawable.java b/graphics/java/android/graphics/drawable/InsetDrawable.java
index 488ee4c..532ee5d 100644
--- a/graphics/java/android/graphics/drawable/InsetDrawable.java
+++ b/graphics/java/android/graphics/drawable/InsetDrawable.java
@@ -408,6 +408,7 @@ public class InsetDrawable extends Drawable implements Drawable.Callback {
if (!mMutated && super.mutate() == this) {
mState = new InsetState(mState);
mDrawable.mutate();
+ mState.mDrawableState = mDrawable.getConstantState();
mMutated = true;
}
return this;