Merge "Cannot compare Binder references for RC display to unregister"

This commit is contained in:
Jean-Michel Trivi
2011-08-29 08:56:23 -07:00
committed by Android (Google) Code Review

View File

@@ -703,7 +703,7 @@ public class RemoteControlClient
private void onUnplugDisplay(IRemoteControlDisplay rcd) { private void onUnplugDisplay(IRemoteControlDisplay rcd) {
synchronized(mCacheLock) { synchronized(mCacheLock) {
if ((mRcDisplay != null) && (mRcDisplay.equals(rcd))) { if ((mRcDisplay != null) && (mRcDisplay.asBinder().equals(rcd.asBinder()))) {
mRcDisplay = null; mRcDisplay = null;
mArtworkExpectedWidth = ARTWORK_DEFAULT_SIZE; mArtworkExpectedWidth = ARTWORK_DEFAULT_SIZE;
mArtworkExpectedHeight = ARTWORK_DEFAULT_SIZE; mArtworkExpectedHeight = ARTWORK_DEFAULT_SIZE;