commit 212d2ec8b463ce536099516dad484cd2d2cd14e6
author Android Build Role Account android-build-prod <android-build-team-robot@google.com> Tue Jun 23 22:03:29 2020 +0000
committer Android Build Role Account android-build-prod <android-build-team-robot@google.com> Tue Jun 23 22:03:29 2020 +0000
tree 21659e5aea705f50ec4e2d05072278c60e6d0106
parent 36426e20bb9d0828ad0e6d3b70c552d85336a243
parent f35850ffc7c8ac0cfdb5b55700b1293c04553b74

Snap for 6619791 from f35850ffc7c8ac0cfdb5b55700b1293c04553b74 to q-keystone-qcom-release

Change-Id: I419f623e039d0e88b74b114ef284964675580666

src/com/android/bluetooth/a2dp/A2dpService.java

diff --git a/src/com/android/bluetooth/a2dp/A2dpService.java b/src/com/android/bluetooth/a2dp/A2dpService.java
index 3c8435b..38ba2d6 100755
--- a/src/com/android/bluetooth/a2dp/A2dpService.java
+++ b/src/com/android/bluetooth/a2dp/A2dpService.java
@@ -880,11 +880,11 @@
 
         if (device == null) {
             // Remove active device and continue playing audio only if necessary.
-            removeActiveDevice(false);
             synchronized(mBtAvrcpLock) {
                 if(mAvrcp_ext != null)
                     mAvrcp_ext.setActiveDevice(device);
             }
+            removeActiveDevice(false);
             return true;
         }