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

Commit 200b863c authored by Yuyang Huang's avatar Yuyang Huang Committed by Automerger Merge Worker
Browse files

Merge "Add usage for ConfirmStreamingRequest and CancelStreamingRequest" into... 

Merge "Add usage for ConfirmStreamingRequest and CancelStreamingRequest" into main am: af67965e am: fdadcd16

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2922628



Change-Id: Ie6e8b315a3e2e5ce98c48d4f973b6e13f0a3eb65
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1db8fb39 fdadcd16

system/bta/ag/bta_ag_sco.cc

+10 −1
Original line number Diff line number Diff line
@@ -261,8 +261,12 @@ static void bta_ag_sco_disc_cback(uint16_t sco_idx) { 
        bta_ag_cb.sco.p_curr_scb->retransmission_effort_retries++;

        bta_ag_cb.sco.p_curr_scb->state = BTA_AG_SCO_CODEC_ST;

        LOG_WARN("eSCO/SCO failed to open, retry with retransmission_effort");

      } else

      } else {

        LOG_ERROR("eSCO/SCO failed to open, no more fall back");

        if (IS_FLAG_ENABLED(is_sco_managed_by_audio)) {

          hfp_offload_interface->CancelStreamingRequest();

        }

      }

    }



    bta_ag_cb.sco.p_curr_scb->inuse_codec = BTM_SCO_CODEC_NONE;
@@ -1439,6 +1443,11 @@ void bta_ag_sco_conn_open(tBTA_AG_SCB* p_scb, 
  bta_ag_sco_event(p_scb, BTA_AG_SCO_CONN_OPEN_E);

  bta_sys_sco_open(BTA_ID_AG, p_scb->app_id, p_scb->peer_addr);



  if (IS_FLAG_ENABLED(is_sco_managed_by_audio)) {

    // ConfirmStreamingRequest before sends callback to java layer

    hfp_offload_interface->ConfirmStreamingRequest();

  }



  /* call app callback */

  bta_ag_cback_sco(p_scb, BTA_AG_AUDIO_OPEN_EVT);