diff options
| author | Chet Haase <chet@google.com> | 2015-08-06 16:23:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-06 16:23:20 +0000 |
| commit | da493aa6eab24de98b63cc63c457f5b899da3ad2 (patch) | |
| tree | 9bece9532614a3d2875890e296b3ce7daacdaefe /core | |
| parent | 190a88d2ce6a08d0eb98d774b81e5ca6b82b45f8 (diff) | |
| parent | bfa11e4ab8e4f85e711e8dd95db51dbd106a3c0f (diff) | |
| download | frameworks_base-da493aa6eab24de98b63cc63c457f5b899da3ad2.zip frameworks_base-da493aa6eab24de98b63cc63c457f5b899da3ad2.tar.gz frameworks_base-da493aa6eab24de98b63cc63c457f5b899da3ad2.tar.bz2 | |
Merge "Avoid changing internal state of shared drawable" into mnc-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/widget/ImageView.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java index e13b96f..ddbaa9d 100644 --- a/core/java/android/widget/ImageView.java +++ b/core/java/android/widget/ImageView.java @@ -384,6 +384,10 @@ public class ImageView extends View { assigned. */ public Drawable getDrawable() { + if (mDrawable == mRecycleableBitmapDrawable) { + // Consider our cached version dirty since app code now has a reference to it + mRecycleableBitmapDrawable = null; + } return mDrawable; } |