commit e386ab30486e12079c7b416a4ca23fb79031ddf3
author pramod kotreshappa <kpramod@codeaurora.org> Mon Jun 10 15:31:59 2019 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Jun 14 03:59:30 2019 -0700
tree 03b57fb1d3b906ba3316e4d609f99c196eb808de
parent 68c22e8b8d0819ddeee2f6ea78316512434a29b3

TWS_AVRCP: Do not retry SHO between TWS+ pair

If setActiveDevice returns false between TWS+ pair, ignore sho
retry. Fix for avrcp setting active device as null when sho
pair is active.

Change-Id: I9191b21295506923111114a91bd48d05b21a0a89

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 a5ed990..4bdfea4 100644
--- a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
+++ b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
@@ -4963,6 +4963,15 @@
         boolean ret = mA2dpService.startSHO(device);
         if(!ret) {
             isShoActive = false;
+            if (device.isTwsPlusDevice()) {
+                BluetoothDevice activeDevice = mA2dpService.getActiveDevice();
+                if (activeDevice != null &&
+                    isTwsPlusPair(device, activeDevice)) {
+                    Log.e(TAG,"TWS+ switch ignored, do not retry sho");
+                    CompleteSHO();
+                    return ret;
+                }
+            }
             mHandler.removeMessages(MESSAGE_START_SHO);
             triggerSHO(device, PlayReq, true);
         }