commit 8d4ed0d8e1e0e0f4a8ed7fc1407a850dc2190040
author Neel Parekh <neel@google.com> Mon Aug 08 13:25:46 2011 -0700
committer Neel Parekh <neel@google.com> Mon Aug 08 13:25:46 2011 -0700
tree 54dc3e8c094e1640371ad190e383e7a51aec1801
parent 930740d1efe00fabc9ff4354cb0379cbbf0765af

Prevent NPE when registering a remote control client

Change-Id: Ia22b456b1cbdd89736118c7e68b7c68dd6e59c64

media/java/android/media/AudioService.java

diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java
index c628be1..4e9f752 100644
--- a/media/java/android/media/AudioService.java
+++ b/media/java/android/media/AudioService.java
@@ -3127,7 +3127,7 @@
             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;
             }