Commit 950af418 authored Aug 06, 2015 by Chet Haase Committed by Android Git Automerger Aug 06, 2015

am ddc15988: am f7d8577e: am 42c70645: am aed2e8ba: am da493aa6: Merge "Avoid...

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

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

parents f67dcd95 ddc15988

core/java/android/widget/ImageView.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}