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

Commit eea3c14a authored by Jack He's avatar Jack He Committed by android-build-merger
Browse files

Merge "HFP: Set audio handle for active device during incoming call" 

am: 1f6535a6

Change-Id: I5ee74df6c21914f1b03e045d60a1fa40e3cc1096
parents 7dd90dcf 1f6535a6

system/bta/ag/bta_ag_cmd.cc

+3 −2
Original line number Diff line number Diff line
@@ -1760,8 +1760,9 @@ void bta_ag_send_ring(tBTA_AG_SCB* p_scb, 
                      UNUSED_ATTR const tBTA_AG_DATA& data) {

  if ((p_scb->conn_service == BTA_AG_HFP) &&

      p_scb->callsetup_ind != BTA_AG_CALLSETUP_INCOMING) {

    APPL_TRACE_DEBUG("%s: don't send the ring since there is no MT call setup",

                     __func__);

    LOG(WARNING) << __func__ << ": don't send RING, conn_service="

                 << std::to_string(p_scb->conn_service)

                 << ", callsetup_ind=" << std::to_string(p_scb->callsetup_ind);

    return;

  }

  /* send RING */

system/bta/ag/bta_ag_sco.cc

+1 −1
Original line number Diff line number Diff line
@@ -1157,7 +1157,7 @@ void bta_ag_sco_listen(tBTA_AG_SCB* p_scb, 
 ******************************************************************************/

void bta_ag_sco_open(tBTA_AG_SCB* p_scb, UNUSED_ATTR const tBTA_AG_DATA& data) {

  if (!sco_allowed) {

    APPL_TRACE_DEBUG("%s not opening sco, by policy", __func__);

    LOG(INFO) << __func__ << ": not opening sco, by policy";

    return;

  }

  /* if another scb using sco, this is a transfer */

system/btif/src/btif_hf.cc

+3 −0
Original line number Diff line number Diff line
@@ -1139,6 +1139,9 @@ bt_status_t HeadsetInterface::PhoneStateChange( 
          res = BTA_AG_CALL_WAIT_RES;

        } else {

          res = BTA_AG_IN_CALL_RES;

          if (is_active_device(*bd_addr)) {

            ag_res.audio_handle = control_block.handle;

          }

        }

        if (number) {

          int xx = 0;