TWSP-HFP: fix issues for creating SCO based on earbud state (2/2)
- In some case, earbud not send AT%QES to report its state immediately after
BT reset and SLC get connected. While HFP connectAudio, DUT think earbud is
not in-ear state and not create SCO. Need create SCO connection for earbud
which has not reported state.
- Start VOIP call while both of earbuds are out of ear state, DUT will not create
SCO connection for any earbud, then no audio disconnected event update to
AudioService and HeadsetService. So that the following VOIP call could not be
started properly. Need send audio disconnected event to upper layer to avoid
this case.
Change-Id: Ibf70ca07cecd906b90d3164bb75b196367ac63cd
CRs-Fixed: 2524579
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 5d579ed..aee4c0c 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
@@ -308,7 +308,8 @@
p_sco->state = BTA_AG_SCO_OPEN_ST;
other_scb = get_other_twsp_scb((p_scb->peer_addr));
if (other_scb && twsp_sco_active(other_scb) == false &&
- get_twsp_state(other_scb) == TWSPLUS_EB_STATE_INEAR) {
+ get_twsp_state(other_scb) != TWSPLUS_EB_STATE_OUT_OF_EAR &&
+ get_twsp_state(other_scb) != TWSPLUS_EB_STATE_INCASE) {
APPL_TRACE_WARNING("Calling SCO open");
dispatch_event_primary_peer_device(p_scb, BTA_AG_SCO_OPEN_E);
}
@@ -319,7 +320,8 @@
p_sco->state = BTA_AG_SCO_LISTEN_ST;
other_scb = get_other_twsp_scb((p_scb->peer_addr));
if (other_scb && twsp_sco_active(other_scb) == false &&
- get_twsp_state(other_scb) == TWSPLUS_EB_STATE_INEAR) {
+ get_twsp_state(other_scb) != TWSPLUS_EB_STATE_OUT_OF_EAR &&
+ get_twsp_state(other_scb) != TWSPLUS_EB_STATE_INCASE) {
//Atleast try bringing up the other EB eSCO
APPL_TRACE_WARNING("Calling SCO open for other EB");
dispatch_event_primary_peer_device(p_scb, BTA_AG_SCO_OPEN_E);
diff --git a/system_bt_ext/btif/include/btif_twsp_hf.h b/system_bt_ext/btif/include/btif_twsp_hf.h
index cd7da30..dc89956 100644
--- a/system_bt_ext/btif/include/btif_twsp_hf.h
+++ b/system_bt_ext/btif/include/btif_twsp_hf.h
@@ -51,5 +51,7 @@
void btif_hf_twsp_send_bvra_update(int idx, tBTA_AG_RES_DATA* ag_res);
+bool btif_hf_check_twsp_state_for_sco(int idx);
+
} // namespace headset
} // namespace bluetooth
diff --git a/system_bt_ext/btif/src/btif_twsp_hf.cc b/system_bt_ext/btif/src/btif_twsp_hf.cc
index 029df6d..9dddeca 100644
--- a/system_bt_ext/btif/src/btif_twsp_hf.cc
+++ b/system_bt_ext/btif/src/btif_twsp_hf.cc
@@ -33,8 +33,10 @@
*/
#include <hardware/bluetooth.h>
+#include "btif_common.h"
#include "btif_hf.h"
#include "btif_tws_plus.h"
+#include "btif_twsp_hf.h"
#include "vendor.h"
#include <cutils/properties.h>
@@ -135,13 +137,32 @@
void btif_hf_twsp_send_bvra_update(int current_index, tBTA_AG_RES_DATA* ag_res) {
int peer_eb_idx = btif_hf_get_other_connected_twsp_index(current_index);
- if ((peer_eb_idx >= 0) && (peer_eb_idx < BTA_AG_MAX_NUM_CLIENTS) &&
+ if ((peer_eb_idx >= 0) && (peer_eb_idx < btif_max_hf_clients) &&
(btif_hf_cb[peer_eb_idx].peer_feat & BTA_AG_PEER_FEAT_VREC)) {
BTIF_TRACE_DEBUG("%s: Send BVRA update for peer earbud, idx: %d", __func__, peer_eb_idx);
BTA_AgResult(btif_hf_cb[peer_eb_idx].handle, BTA_AG_BVRA_RES, ag_res);
}
}
+bool btif_hf_check_twsp_state_for_sco(int idx) {
+ BTIF_TRACE_DEBUG("%s: Current earbud state: %d", __func__, btif_hf_cb[idx].twsp_state);
+ if (btif_hf_cb[idx].twsp_state == TWSPLUS_EB_STATE_OUT_OF_EAR ||
+ btif_hf_cb[idx].twsp_state == TWSPLUS_EB_STATE_INCASE) {
+ int peer_eb_idx = btif_hf_get_other_connected_twsp_index(idx);
+ if ((peer_eb_idx < 0) || (peer_eb_idx >= btif_max_hf_clients) ||
+ (btif_hf_cb[peer_eb_idx].twsp_state == TWSPLUS_EB_STATE_OUT_OF_EAR) ||
+ (btif_hf_cb[peer_eb_idx].twsp_state == TWSPLUS_EB_STATE_INCASE)) {
+ BTIF_TRACE_DEBUG("%s: No any connected earbud in ear", __func__);
+ btif_transfer_context(btif_in_hf_generic_evt, BTIF_HFP_CB_AUDIO_CONNECTING,
+ (char*)(&btif_hf_cb[idx].connected_bda), sizeof(RawAddress), NULL);
+ btif_transfer_context(btif_in_hf_generic_evt, BTIF_HFP_CB_AUDIO_DISCONNECTED,
+ (char*)(&btif_hf_cb[idx].connected_bda), sizeof(RawAddress), NULL);
+ }
+ return false;
+ }
+ return true;
+}
+
} // namespace headset
} // namespace bluetooth