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

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

Merge "HFP: Return SDP status to HFP layer" 

am: b7ffc19d

Change-Id: I50e4a44b66ef727bd8243fc2182a2ddb36bbfbb1
parents e09091e8 b7ffc19d

system/bta/ag/bta_ag_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -175,8 +175,8 @@ void bta_ag_start_dereg(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) { 
 ******************************************************************************/

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

  p_scb->peer_addr = data.api_open.bd_addr;

  p_scb->open_services = data.api_open.services;

  p_scb->cli_sec_mask = data.api_open.sec_mask;

  p_scb->open_services = p_scb->reg_services;



  /* Check if RFCOMM has any incoming connection to avoid collision. */

  RawAddress pending_bd_addr = RawAddress::kEmpty;

system/bta/ag/bta_ag_api.cc

+1 −3
Original line number Diff line number Diff line
@@ -127,11 +127,9 @@ void BTA_AgDeregister(uint16_t handle) { 
 * Returns          void

 *

 ******************************************************************************/

void BTA_AgOpen(uint16_t handle, const RawAddress& bd_addr, tBTA_SEC sec_mask,

                tBTA_SERVICE_MASK services) {

void BTA_AgOpen(uint16_t handle, const RawAddress& bd_addr, tBTA_SEC sec_mask) {

  tBTA_AG_DATA data = {};

  data.api_open.bd_addr = bd_addr;

  data.api_open.services = services;

  data.api_open.sec_mask = sec_mask;

  do_in_bta_thread(FROM_HERE, base::Bind(&bta_ag_sm_execute_by_handle, handle,

                                         BTA_AG_API_OPEN_EVT, data));

system/bta/ag/bta_ag_int.h

+0 −1
Original line number Diff line number Diff line
@@ -126,7 +126,6 @@ typedef struct { 
/* data type for BTA_AG_API_OPEN_EVT */

typedef struct {

  RawAddress bd_addr;

  tBTA_SERVICE_MASK services;

  tBTA_SEC sec_mask;

} tBTA_AG_API_OPEN;

system/bta/ag/bta_ag_main.cc

+0 −1
Original line number Diff line number Diff line
@@ -565,7 +565,6 @@ void bta_ag_resume_open(tBTA_AG_SCB* p_scb) { 
    LOG(INFO) << __func__ << ": Resume connection to " << p_scb->peer_addr

              << ", handle" << bta_ag_scb_to_idx(p_scb);

    tBTA_AG_DATA open_data = {.api_open.bd_addr = p_scb->peer_addr,

                              .api_open.services = p_scb->open_services,

                              .api_open.sec_mask = p_scb->cli_sec_mask};

    bta_ag_sm_execute(p_scb, BTA_AG_API_OPEN_EVT, open_data);

  } else {

system/bta/ag/bta_ag_sdp.cc

+2 −1
Original line number Diff line number Diff line
@@ -86,8 +86,9 @@ static void bta_ag_sdp_cback(uint16_t status, uint8_t idx) { 
    } else {

      event = BTA_AG_DISC_INT_RES_EVT;

    }

    tBTA_AG_DATA disc_result = {.disc_result.status = status};

    do_in_bta_thread(FROM_HERE, base::Bind(&bta_ag_sm_execute_by_handle, idx,

                                           event, tBTA_AG_DATA::kEmpty));

                                           event, disc_result));

  }

}