am ddc15988: am f7d8577e: am 42c70645: am aed2e8ba: am da493aa6: Merge "Avoid changing internal state of shared drawable" into mnc-dev

* commit 'ddc1598871be09e132dc49dba011d38007c4335b':
  Avoid changing internal state of shared drawable

1 files changed, 4 insertions, 0 deletions

diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java
index 836495179dfe..20fe61d25f26 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;
     }