commit 731e92d29f01c0cde2f5da2c03eb29a46ddd41f9
author Mingbo Zhang <mingboz@codeaurora.org> Fri Jan 10 15:50:46 2020 +0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Sun Jan 19 19:23:06 2020 -0800
tree f7bb5270661d68c1263dc6d8dee69dce262f08d1
parent 26684f130755966cdf68c1f090fff84dac7cdab0

Avrcp_ext: always clear isShoActive after a2dp becomes playing

Analysis:
1) One device is active, and a2dp is playing.
2) User sets active device to a new device, then startSHO will be
   called with PlayReq true, then isShoActive is set to true.
3) SHO is done, and a2dp becomes playing again. Because avrcp
   of the new active device is not connected, isShoActive cannot
   be cleared, which caused that all the following SHO will be
   equeued incorrectly.

Fix:
Always clear variable isShoActive after a2dp becomes playing
even though avrcp is not connected.

Change-Id: If898ab177e70533ce31f77df8437240e9a832988
CRs-Fixed: 2597340

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 df0efe6..973dba6 100644
--- a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
+++ b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
@@ -1443,18 +1443,6 @@
                 mA2dpState = msg.arg1;
                 BluetoothDevice playStateChangeDevice = (BluetoothDevice)msg.obj;
                 Log.v(TAG, "event for device address " + playStateChangeDevice.getAddress());
-                deviceIndex = getIndexForDevice(playStateChangeDevice);
-                if (deviceIndex == INVALID_DEVICE_INDEX) {
-                    Log.e(TAG,"Set A2DP state: invalid index for device");
-                    break;
-                }
-                // if BA streaming is ongoing, don't update AVRCP state based on A2DP State.
-                // This is for some remote devices, which send PLAY/PAUSE based on AVRCP State.
-                BATService mBatService = BATService.getBATService();
-                if ((mBatService == null) || !mBatService.isA2dpSuspendFromBA()) {
-                  // if this suspend was triggered by BA, then don't update AVRCP states
-                  updateCurrentMediaState((BluetoothDevice)msg.obj);
-                }
 
                 if (mA2dpState == BluetoothA2dp.STATE_PLAYING) {
                     boolean shoComplete = false;
@@ -1474,6 +1462,20 @@
                         CompleteSHO();
                     }
                 }
+
+                deviceIndex = getIndexForDevice(playStateChangeDevice);
+                if (deviceIndex == INVALID_DEVICE_INDEX) {
+                    Log.e(TAG,"Set A2DP state: invalid index for device");
+                    break;
+                }
+                // if BA streaming is ongoing, don't update AVRCP state based on A2DP State.
+                // This is for some remote devices, which send PLAY/PAUSE based on AVRCP State.
+                BATService mBatService = BATService.getBATService();
+                if ((mBatService == null) || !mBatService.isA2dpSuspendFromBA()) {
+                  // if this suspend was triggered by BA, then don't update AVRCP states
+                  updateCurrentMediaState((BluetoothDevice)msg.obj);
+                }
+
               }
               break;