From 34d0d300cac645b48cce5a1735f45e1102d4ef0e Mon Sep 17 00:00:00 2001
From: Jean-Michel Trivi <jmtrivi@google.com>
Date: Fri, 16 Sep 2011 10:41:04 -0700
Subject: [PATCH] Fix bug 5327199 Recycle bitmaps in RemoteControlClient

When applying the new bitmap from the editor to the client,
 recycle the old bitmap, and set the reference to the editor
 bitmap to null.

Change-Id: I7d79e4b8410e5035fa51b20be4b1ada391c84c28
---
 media/java/android/media/RemoteControlClient.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/media/java/android/media/RemoteControlClient.java b/media/java/android/media/RemoteControlClient.java
index f66f1b028e404..cdebba0e68cd2 100644
--- a/media/java/android/media/RemoteControlClient.java
+++ b/media/java/android/media/RemoteControlClient.java
@@ -482,7 +482,11 @@ public class RemoteControlClient
             synchronized(mCacheLock) {
                 // assign the edited data
                 mMetadata = new Bundle(mEditorMetadata);
+                if ((mArtwork != null) && (!mArtwork.equals(mEditorArtwork))) {
+                    mArtwork.recycle();
+                }
                 mArtwork = mEditorArtwork;
+                mEditorArtwork = null;
                 if (mMetadataChanged & mArtworkChanged) {
                     // send to remote control display if conditions are met
                     sendMetadataWithArtwork_syncCacheLock();