Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16a909f3 authored by Yun-Hao Chung's avatar Yun-Hao Chung Committed by Yun-hao Chung
Browse files

Floss: Don't retry sco settings if we are not initiator 

It should be initiator's responsibility to retry the sco settings.

This patch will be needed to pass HFP/AG/ACS/BI-13-C once we allow CVSD
fallback to S1.

Bug: 324157546
Bug: 332650199
Test: Run above qualification tests
Test: m -j
Tag: #floss
Change-Id: I5500470dd3dea7e016978e3b29763978e1f8a84e
parent d50b7538

system/bta/ag/bta_ag_sco.cc

+14 −2
Original line number Diff line number Diff line
@@ -230,7 +230,13 @@ static void bta_ag_sco_disc_cback(uint16_t sco_idx) { 
      /* If SCO open was initiated by AG and failed for mSBC T2, try mSBC T1

       * 'Safe setting' first. If T1 also fails, try CVSD

       * same operations for LC3 settings */

      if (bta_ag_sco_is_opening(bta_ag_cb.sco.p_curr_scb)) {

      if (bta_ag_sco_is_opening(bta_ag_cb.sco.p_curr_scb) &&

#if TARGET_FLOSS

          (false ||

#else

          (!IS_FLAG_ENABLED(fix_hfp_qual_1_9) ||

#endif

           bta_ag_cb.sco.is_local)) {

        /* Don't bother to edit |p_curr_scb->state| because it is in

         * |BTA_AG_OPEN_ST|, which has the same value as |BTA_AG_SCO_CODEC_ST|

         */
@@ -268,7 +274,13 @@ 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)) {

    } else if (bta_ag_sco_is_opening(bta_ag_cb.sco.p_curr_scb) &&

#if TARGET_FLOSS

               (false ||

#else

               (!IS_FLAG_ENABLED(fix_hfp_qual_1_9) ||

#endif

                bta_ag_cb.sco.is_local)) {

      if (IS_FLAG_ENABLED(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++;