summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--flags/hfp.aconfig6
-rw-r--r--system/bta/ag/bta_ag_act.cc1
-rw-r--r--system/bta/ag/bta_ag_int.h2
-rw-r--r--system/bta/ag/bta_ag_main.cc1
-rw-r--r--system/bta/ag/bta_ag_sco.cc57
5 files changed, 18 insertions, 49 deletions
diff --git a/flags/hfp.aconfig b/flags/hfp.aconfig
index c0c799f315..473c52cdfd 100644
--- a/flags/hfp.aconfig
+++ b/flags/hfp.aconfig
@@ -15,12 +15,6 @@ flag {
bug: "315234036"
}
-flag {
- name: "retry_esco_with_zero_retransmission_effort"
- namespace: "bluetooth"
- description: "retry eSCO connection based on retransmission_effort"
- bug: "316498257"
-}
flag {
name: "hfp_software_datapath"
diff --git a/system/bta/ag/bta_ag_act.cc b/system/bta/ag/bta_ag_act.cc
index 559df238a2..b64fd333fe 100644
--- a/system/bta/ag/bta_ag_act.cc
+++ b/system/bta/ag/bta_ag_act.cc
@@ -402,7 +402,6 @@ void bta_ag_rfc_close(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& /* data */) {
p_scb->codec_updated = false;
p_scb->codec_fallback = false;
p_scb->trying_cvsd_safe_settings = false;
- p_scb->retransmission_effort_retries = 0;
p_scb->codec_msbc_settings = BTA_AG_SCO_MSBC_SETTINGS_T2;
p_scb->codec_cvsd_settings = BTA_AG_SCO_CVSD_SETTINGS_S4;
p_scb->codec_aptx_settings = BTA_AG_SCO_APTX_SWB_SETTINGS_Q0;
diff --git a/system/bta/ag/bta_ag_int.h b/system/bta/ag/bta_ag_int.h
index 9545bb6038..4faeb614c1 100644
--- a/system/bta/ag/bta_ag_int.h
+++ b/system/bta/ag/bta_ag_int.h
@@ -332,8 +332,6 @@ struct tBTA_AG_SCB {
bool codec_fallback; /* If sco nego fails for mSBC, fallback to CVSD */
bool trying_cvsd_safe_settings; /* set to true whenever we are trying CVSD
safe settings */
- uint8_t retransmission_effort_retries; /* Retry eSCO
- with retransmission_effort value*/
tBTA_AG_SCO_MSBC_SETTINGS codec_msbc_settings; /* settings to be used for the
impending eSCO on WB */
tBTA_AG_SCO_LC3_SETTINGS codec_lc3_settings; /* settings to be used for the
diff --git a/system/bta/ag/bta_ag_main.cc b/system/bta/ag/bta_ag_main.cc
index 2b95b5de39..3a0b8eb70a 100644
--- a/system/bta/ag/bta_ag_main.cc
+++ b/system/bta/ag/bta_ag_main.cc
@@ -152,7 +152,6 @@ static tBTA_AG_SCB* bta_ag_scb_alloc(void) {
p_scb->codec_updated = false;
p_scb->codec_fallback = false;
p_scb->trying_cvsd_safe_settings = false;
- p_scb->retransmission_effort_retries = 0;
p_scb->peer_codecs = BTM_SCO_CODEC_CVSD;
p_scb->sco_codec = BTM_SCO_CODEC_CVSD;
p_scb->peer_version = HFP_HSP_VERSION_UNKNOWN;
diff --git a/system/bta/ag/bta_ag_sco.cc b/system/bta/ag/bta_ag_sco.cc
index a8e38c24a7..34102d1dd6 100644
--- a/system/bta/ag/bta_ag_sco.cc
+++ b/system/bta/ag/bta_ag_sco.cc
@@ -284,24 +284,15 @@ static void bta_ag_sco_disc_cback(uint16_t sco_idx) {
}
} else if (bta_ag_sco_is_opening(bta_ag_cb.sco.p_curr_scb) &&
(!com::android::bluetooth::flags::fix_hfp_qual_1_9() || bta_ag_cb.sco.is_local)) {
- if (com::android::bluetooth::flags::retry_esco_with_zero_retransmission_effort() &&
- bta_ag_cb.sco.p_curr_scb->retransmission_effort_retries == 0) {
- bta_ag_cb.sco.p_curr_scb->retransmission_effort_retries++;
- if (!com::android::bluetooth::flags::fix_hfp_qual_1_9()) {
- bta_ag_cb.sco.p_curr_scb->state = (tBTA_AG_STATE)BTA_AG_SCO_CODEC_ST;
- }
- log::warn("eSCO/SCO failed to open, retry with retransmission_effort");
- } else {
- log::error("eSCO/SCO failed to open, no more fall back");
- if (bta_ag_is_sco_managed_by_audio()) {
- if (hfp_software_datapath_enabled) {
- if (hfp_encode_interface) {
- hfp_encode_interface->CancelStreamingRequest();
- hfp_decode_interface->CancelStreamingRequest();
- }
- } else {
- hfp_offload_interface->CancelStreamingRequest();
+ log::error("eSCO/SCO failed to open, no more fall back");
+ if (bta_ag_is_sco_managed_by_audio()) {
+ if (hfp_software_datapath_enabled) {
+ if (hfp_encode_interface) {
+ hfp_encode_interface->CancelStreamingRequest();
+ hfp_decode_interface->CancelStreamingRequest();
}
+ } else {
+ hfp_offload_interface->CancelStreamingRequest();
}
}
}
@@ -534,13 +525,6 @@ void bta_ag_create_sco(tBTA_AG_SCB* p_scb, bool is_orig) {
updateCodecParametersFromProviderInfo(esco_codec, params);
- if (com::android::bluetooth::flags::retry_esco_with_zero_retransmission_effort() &&
- p_scb->retransmission_effort_retries == 1) {
- log::info("change retransmission_effort to 0, retry");
- p_scb->retransmission_effort_retries++;
- params.retransmission_effort = ESCO_RETRANSMISSION_OFF;
- }
-
/* Configure input/output data path based on HAL settings. */
hfp_hal_interface::set_codec_datapath(esco_codec);
hfp_hal_interface::update_esco_parameters(&params);
@@ -1484,8 +1468,6 @@ void bta_ag_sco_conn_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& /* data */) {
/* call app callback */
bta_ag_cback_sco(p_scb, BTA_AG_AUDIO_OPEN_EVT);
- /* reset retransmission_effort_retries*/
- p_scb->retransmission_effort_retries = 0;
/* reset to mSBC T2 settings as the preferred */
p_scb->codec_msbc_settings = BTA_AG_SCO_MSBC_SETTINGS_T2;
/* reset to LC3 T2 settings as the preferred */
@@ -1516,19 +1498,16 @@ void bta_ag_sco_conn_close(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& /* data */) {
/* codec_fallback is set when AG is initiator and connection failed for mSBC.
* OR if codec is msbc and T2 settings failed, then retry Safe T1 settings
* same operations for LC3 settings */
- if (p_scb->svc_conn &&
- (p_scb->codec_fallback ||
- (p_scb->sco_codec == BTM_SCO_CODEC_MSBC &&
- p_scb->codec_msbc_settings == BTA_AG_SCO_MSBC_SETTINGS_T1) ||
- (p_scb->sco_codec == BTM_SCO_CODEC_LC3 &&
- p_scb->codec_lc3_settings == BTA_AG_SCO_LC3_SETTINGS_T1) ||
- (com::android::bluetooth::flags::retry_esco_with_zero_retransmission_effort() &&
- p_scb->retransmission_effort_retries == 1) ||
- aptx_voice ||
- (com::android::bluetooth::flags::fix_hfp_qual_1_9() &&
- p_scb->sco_codec == BTM_SCO_CODEC_CVSD &&
- p_scb->codec_cvsd_settings == BTA_AG_SCO_CVSD_SETTINGS_S1 &&
- p_scb->trying_cvsd_safe_settings))) {
+ if (p_scb->svc_conn && (p_scb->codec_fallback ||
+ (p_scb->sco_codec == BTM_SCO_CODEC_MSBC &&
+ p_scb->codec_msbc_settings == BTA_AG_SCO_MSBC_SETTINGS_T1) ||
+ (p_scb->sco_codec == BTM_SCO_CODEC_LC3 &&
+ p_scb->codec_lc3_settings == BTA_AG_SCO_LC3_SETTINGS_T1) ||
+ aptx_voice ||
+ (com::android::bluetooth::flags::fix_hfp_qual_1_9() &&
+ p_scb->sco_codec == BTM_SCO_CODEC_CVSD &&
+ p_scb->codec_cvsd_settings == BTA_AG_SCO_CVSD_SETTINGS_S1 &&
+ p_scb->trying_cvsd_safe_settings))) {
bta_ag_sco_event(p_scb, BTA_AG_SCO_REOPEN_E);
} else {
/* Indicate if the closing of audio is because of transfer */
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-10-19 17:11:37 +0000