commit eecff1d0d38f5df9375adce4b4d6ab340e99d2a1
author Ajay Panicker <apanicke@google.com> Fri Nov 09 11:01:43 2018 -0800
committer Jack He <siyuanh@google.com> Wed Nov 14 02:27:00 2018 +0000
tree 69b5abbc68b85f3c693486c0cdd6e05189bdefb9
parent f9b54878b194ca93104d686a1e91fccd2685a524

Synchronize DeviceDisconnect in VolumeManager

Sometimes the device would disconnect when attempting to switch devices
which would cause a Null Pointer Exception.

Bug: 116489958
Test: Sanity test switching between devices
Change-Id: I0cd4eeb82564b69af9164cca9019f9463ac44f06
(cherry picked from commit 4b40a547b399e547187818fb7bf5f42a0bcb565e)

src/com/android/bluetooth/newavrcp/AvrcpVolumeManager.java

diff --git a/src/com/android/bluetooth/newavrcp/AvrcpVolumeManager.java b/src/com/android/bluetooth/newavrcp/AvrcpVolumeManager.java
index fde4947..2e2ce42 100644
--- a/src/com/android/bluetooth/newavrcp/AvrcpVolumeManager.java
+++ b/src/com/android/bluetooth/newavrcp/AvrcpVolumeManager.java
@@ -195,7 +195,7 @@
         mCurrentDevice = device;
     }
 
-    void deviceDisconnected(@NonNull BluetoothDevice device) {
+    synchronized void deviceDisconnected(@NonNull BluetoothDevice device) {
         d("deviceDisconnected: device=" + device);
         mDeviceMap.remove(device);
     }