commit 6862cd62f50f07e78fc61dcd3ee81c26b308b301
author Anand Mohan <quic_anamoh@quicinc.com> Wed Jun 21 19:27:57 2023 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Jul 03 00:58:54 2023 -0700
tree 4a5878dee1eae416492110050ce251e2a8451981
parent 84c99e289809314609ff5c1bb90b8e9b71676cae

pal: handling for SCO when DEVICE_NONE routing comes while dev is disconnected

If a stream is active on SCO and playback has ended, APM will send routing=0.
Stream will be closed in PAL after standby time. If SCO device gets disconnected,
this stream will not receive new routing and stream will remain with SCO for the
time being. If SCO device gets connected again with different config in the
meantime and capture stream tries to start ABR path, it will lead to error due to
config mismatch.

Added handling to route SCO streams to Speaker during ReleaseAudiPatch when SCO
device is disconnected.

Change-Id: I59d0b785054c5761b97ecd768877c09010385391

stream/src/Stream.cpp

diff --git a/stream/src/Stream.cpp b/stream/src/Stream.cpp
index 355d35e..60fac2c 100644
--- a/stream/src/Stream.cpp
+++ b/stream/src/Stream.cpp
@@ -1373,6 +1373,7 @@
     int32_t connectCount = 0, disconnectCount = 0;
     bool isNewDeviceA2dp = false;
     bool isCurDeviceA2dp = false;
+    bool isCurDeviceSco = false;
     bool isCurrentDeviceProxyOut = false;
     bool isCurrentDeviceDpOut = false;
     bool matchFound = false;
@@ -1425,6 +1426,11 @@
             curBtDevId = curDevId;
         }
 
+        if (curDevId == PAL_DEVICE_OUT_BLUETOOTH_SCO) {
+            isCurDeviceSco = true;
+            curBtDevId = curDevId;
+        }
+
         if (curDevId == PAL_DEVICE_OUT_PROXY)
             isCurrentDeviceProxyOut = true;
 
@@ -1497,11 +1503,19 @@
          * But the audioflinger continues to write data until standby time
          * (3sec). As BT is turned off, the write gets blocked.
          * Avoid this by routing audio to speaker until standby.
+         *
+         * If a stream is active on SCO and playback has ended, APM will send
+         * routing=0. Stream will be closed in PAL after standby time. If SCO
+         * device gets disconnected, this stream will not receive new routing
+         * and stream will remain with SCO for the time being. If SCO device
+         * gets connected again with different config in the meantime and
+         * capture stream tries to start ABR path, it will lead to error due to
+         * config mismatch. Added OUT_SCO device handling to resolve this.
          */
         // This assumes that PAL_DEVICE_NONE comes as single device
         if ((newDevices[i].id == PAL_DEVICE_NONE) &&
-            (((isCurDeviceA2dp == true) && (!rm->isDeviceReady(curBtDevId))) ||
-             (isCurrentDeviceProxyOut) || (isCurrentDeviceDpOut))) {
+            ((isCurrentDeviceProxyOut) || (isCurrentDeviceDpOut) ||
+             ((isCurDeviceA2dp || isCurDeviceSco) && (!rm->isDeviceReady(curBtDevId))))) {
             newDevices[i].id = PAL_DEVICE_OUT_SPEAKER;
 
             if (rm->getDeviceConfig(&newDevices[i], mStreamAttr)) {