commit 7309c83b95b36eac141680158df70ac1ce02a160
author Jean-Michel Trivi <jmtrivi@google.com> Fri Aug 26 18:33:02 2011 -0700
committer Jean-Michel Trivi <jmtrivi@google.com> Fri Aug 26 18:54:44 2011 -0700
tree 03bfa9618de15c7831f0d060d2dce1e9fd5db05d
parent 18e7bce52318f00b5023f33933a571c477f2b61c

Cannot compare Binder references for RC display to unregister

Cannot trust references to IRemoteControlDisplay to remain the
 same when removing a RemoteControlDisplay, compare the
 result of .asBinder() instead.

Change-Id: Ib2e82aa24bd4b12804bccff94a6a0090ff83bea8

media/java/android/media/RemoteControlClient.java

diff --git a/media/java/android/media/RemoteControlClient.java b/media/java/android/media/RemoteControlClient.java
index 2bdd3c9..d59bc2b 100644
--- a/media/java/android/media/RemoteControlClient.java
+++ b/media/java/android/media/RemoteControlClient.java
@@ -703,7 +703,7 @@
 
     private void onUnplugDisplay(IRemoteControlDisplay rcd) {
         synchronized(mCacheLock) {
-            if ((mRcDisplay != null) && (mRcDisplay.equals(rcd))) {
+            if ((mRcDisplay != null) && (mRcDisplay.asBinder().equals(rcd.asBinder()))) {
                 mRcDisplay = null;
                 mArtworkExpectedWidth = ARTWORK_DEFAULT_SIZE;
                 mArtworkExpectedHeight = ARTWORK_DEFAULT_SIZE;