Merge "Fix bug 5300223 Lockscreen should recycle bitmaps" into ics-factoryrom

jmtrivi · Android (Google) Code Review · commit 6c03850616a6 · 2011-09-19T15:37:23.000-07:00
diff --git a/core/java/com/android/internal/widget/TransportControlView.java b/core/java/com/android/internal/widget/TransportControlView.java
@@ -102,6 +102,9 @@ public void handleMessage(Message msg) {
 
             case MSG_SET_ARTWORK:
                 if (mClientGeneration == msg.arg1) {
+                    if (mMetadata.bitmap != null) {
+                        mMetadata.bitmap.recycle();
+                    }
                     mMetadata.bitmap = (Bitmap) msg.obj;
                     mAlbumArt.setImageBitmap(mMetadata.bitmap);
                 }

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,9 @@ public void handleMessage(Message msg) {`
`102`	`102`
`103`	`103`	`case MSG_SET_ARTWORK:`
`104`	`104`	`if (mClientGeneration == msg.arg1) {`
	`105`	`+ if (mMetadata.bitmap != null) {`
	`106`	`+ mMetadata.bitmap.recycle();`
	`107`	`+ }`
`105`	`108`	`mMetadata.bitmap = (Bitmap) msg.obj;`
`106`	`109`	`mAlbumArt.setImageBitmap(mMetadata.bitmap);`
`107`	`110`	`}`