commit c320019fd34e11d843e74c0fee27e766c94bfa1b
author chandan mishra <chanmish@codeaurora.org> Thu May 21 15:05:13 2020 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Jun 23 01:28:54 2020 -0700
tree 1386f9d56069eb2e1ad633696b226b3fc59a0c15
parent 8aac7f38f4eecb6c9fb3026ec58f18650df12dcb

AVRCP: If setActive is null reset isActive before updating to MM

If there is not active device than update isActive flag false
before updating device disconnection to MM audio.
It will avoid storeVolumeForDevice function call twice
during SHO/BT disconnection.

CRs-Fixed: 2691010
Change-Id: If607005b6a3e25af64467348f5d52c8033f4ae29

packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java

diff --git a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
index c415690..32fc833 100644
--- a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
+++ b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
@@ -1685,12 +1685,6 @@
                 boolean tws_switch = false;
                 Log.d(TAG, "MSG_SET_ACTIVE_DEVICE");
                 BluetoothDevice bt_device = (BluetoothDevice) msg.obj;
-                if (bt_device == null) {
-                    for (int i = 0; i < maxAvrcpConnections; i++) {
-                        deviceFeatures[i].isActiveDevice = false;
-                    }
-                    break;
-                }
                 if (bt_device != null && bt_device.isTwsPlusDevice()) {
                     for (int i = 0; i < maxAvrcpConnections; i++) {
                         if (deviceFeatures[i].mCurrentDevice != null &&
@@ -5370,8 +5364,15 @@
 
     public void setActiveDevice(BluetoothDevice device) {
         Log.w(TAG, "setActiveDevice call for device " + device);
-        Message msg = mHandler.obtainMessage(MSG_SET_ACTIVE_DEVICE, 0, 0, device);
-        mHandler.sendMessage(msg);
+        if (device == null) {
+            for (int i = 0; i < maxAvrcpConnections; i++) {
+                deviceFeatures[i].isActiveDevice = false;
+            }
+        }
+        else {
+            Message msg = mHandler.obtainMessage(MSG_SET_ACTIVE_DEVICE, 0, 0, device);
+            mHandler.sendMessage(msg);
+        }
     }
 
     private SharedPreferences getVolumeMap() {