commit aee6c7fb68753ecd65767a79f3b7561d44951811
author Marie Janssen <jamuraa@google.com> Wed Jun 21 00:38:00 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 21 00:38:02 2017 +0000
tree 9965e96494852e9a59183245ed2a4e64fb06fa3f
parent 0733dd54f0a7631b9a03ec440231e9cc27b47845
parent 9a5f80a6528d76153a7e97821f114f3370df89a5

Merge "AVRCP: Prevent multithread issues in cleanup"

src/com/android/bluetooth/avrcp/AddressedMediaPlayer.java

diff --git a/src/com/android/bluetooth/avrcp/AddressedMediaPlayer.java b/src/com/android/bluetooth/avrcp/AddressedMediaPlayer.java
index f67165d..d857228 100644
--- a/src/com/android/bluetooth/avrcp/AddressedMediaPlayer.java
+++ b/src/com/android/bluetooth/avrcp/AddressedMediaPlayer.java
@@ -133,7 +133,9 @@
         }
         mNowPlayingList = items;
         // TODO (jamuraa): test to see if the single-item queue is the same and don't send
-        mMediaInterface.nowPlayingChangedRsp(AvrcpConstants.NOTIFICATION_TYPE_CHANGED);
+        if (mMediaInterface != null) {
+            mMediaInterface.nowPlayingChangedRsp(AvrcpConstants.NOTIFICATION_TYPE_CHANGED);
+        }
         return items;
     }
 

src/com/android/bluetooth/avrcp/Avrcp.java

diff --git a/src/com/android/bluetooth/avrcp/Avrcp.java b/src/com/android/bluetooth/avrcp/Avrcp.java
index 6b3fc10..8d7d488 100644
--- a/src/com/android/bluetooth/avrcp/Avrcp.java
+++ b/src/com/android/bluetooth/avrcp/Avrcp.java
@@ -292,7 +292,7 @@
         context.registerReceiver(mBootReceiver, bootFilter);
     }
 
-    private void start() {
+    private synchronized void start() {
         HandlerThread thread = new HandlerThread("BluetoothAvrcpHandler");
         thread.start();
         Looper looper = thread.getLooper();
@@ -334,11 +334,9 @@
         return ar;
     }
 
-    public void doQuit() {
+    public synchronized void doQuit() {
         if (DEBUG) Log.d(TAG, "doQuit");
-        synchronized (this) {
-            if (mMediaController != null) mMediaController.unregisterCallback(mMediaControllerCb);
-        }
+        if (mMediaController != null) mMediaController.unregisterCallback(mMediaControllerCb);
         if (mMediaSessionManager != null) {
             mMediaSessionManager.setCallback(null, null);
             mMediaSessionManager.removeOnActiveSessionsChangedListener(mActiveSessionListener);