From 8d4ed0d8e1e0e0f4a8ed7fc1407a850dc2190040 Mon Sep 17 00:00:00 2001
From: Neel Parekh <neel@google.com>
Date: Mon, 8 Aug 2011 13:25:46 -0700
Subject: [PATCH] Prevent NPE when registering a remote control client

Change-Id: Ia22b456b1cbdd89736118c7e68b7c68dd6e59c64
---
 media/java/android/media/AudioService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java
index c628be165c758..4e9f752e5378d 100644
--- a/media/java/android/media/AudioService.java
+++ b/media/java/android/media/AudioService.java
@@ -3127,7 +3127,7 @@ public class AudioService extends IAudioService.Stub {
             return;
         }
         synchronized(mCurrentRcLock) {
-            if (!mCurrentRcClientRef.get().equals(rcse.mRcClientRef.get())) {
+            if (!rcse.mRcClientRef.get().equals(mCurrentRcClientRef.get())) {
                 // new RC client, assume every type of information shall be queried
                 mCurrentRcClientInfoFlags = RC_INFO_ALL;
             }