commit 2e35d279098577236301d3a99cf1bb6b2adca9d7
author zhenchao <zhenchao@codeaurora.org> Thu Feb 20 16:46:32 2020 +0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Mar 24 20:53:54 2020 -0700
tree 5bbe707d1836aa22f5bdddfd3a27a20456cbbfd5
parent 4b083d660b8317e5ea82f29da18aca3d1126481f

HFP: cleanup sco_idx properly while receive SCO SHUTDOWN event (2/2)

In below corner cases, sco_idx of scb is not cleanup so that the
following create sco connection failed with sco index already in use.

1) Rfcomm closed before SCO is disconnected, then bta_ag_sco_conn_close
would be ignored because peer address is empty.
2) Receive SCO_SHUTDOWN or SCO_CONN_CLOSE event while SCO SM is SHUTTING
state, TWSP path will not clean sco_idx.

Change-Id: I92fd78273f658033d4b31e6e25db7c422c9714ea
CRs-Fixed: 2643045

system_bt_ext/bta/tws_plus/ag/bta_ag_twsp_sco.cc

diff --git a/system_bt_ext/bta/tws_plus/ag/bta_ag_twsp_sco.cc b/system_bt_ext/bta/tws_plus/ag/bta_ag_twsp_sco.cc
index 4a22347..99372c3 100644
--- a/system_bt_ext/bta/tws_plus/ag/bta_ag_twsp_sco.cc
+++ b/system_bt_ext/bta/tws_plus/ag/bta_ag_twsp_sco.cc
@@ -376,7 +376,13 @@
 
           /* If SCO was active on this scb, close it */
           if (p_scb == p_sco->p_curr_scb) {
-            p_sco->state = BTA_AG_SCO_SHUTTING_ST;
+            if (p_scb->svc_conn) {
+              p_sco->state = BTA_AG_SCO_SHUTTING_ST;
+            } else {
+              p_sco->state = BTA_AG_SCO_SHUTDOWN_ST;
+              p_scb->sco_idx = BTM_INVALID_SCO_INDEX;
+              p_sco->p_curr_scb = NULL;
+            }
           }
           break;