diff options
| author | Chet Haase <chet@google.com> | 2015-08-06 16:44:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-06 16:44:32 +0000 |
| commit | f7d8577ed048361ffac711a721acc69f83ab6e01 (patch) | |
| tree | 3362185ad651050bfd4c420ea511a7aa679a4b0d /core/java/android/widget | |
| parent | 351c3bd16b4c23d267f3dc2c00a555a82fd7e77e (diff) | |
| parent | 42c70645d28f07db145e02fd4a11af99c6437936 (diff) | |
am 42c70645: am aed2e8ba: am da493aa6: Merge "Avoid changing internal state of shared drawable" into mnc-dev
* commit '42c70645d28f07db145e02fd4a11af99c6437936':
Avoid changing internal state of shared drawable
Diffstat (limited to 'core/java/android/widget')
| -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 e13b96fb5ba1..ddbaa9db6444 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; } |