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

Commit 8b657ce7 authored by Hansong Zhang's avatar Hansong Zhang
Browse files

HFP AG: Simplify passing security mask 

It's always BTA_SEC_AUTHENTICATE | BTA_SEC_ENCRYPT.

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Iadedfc5d0f818d9d5493f43c113813bb97d0ba2b
parent 157acb72

system/bta/ag/bta_ag_act.cc

+2 −2
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static void bta_ag_cback_open(tBTA_AG_SCB* p_scb, const RawAddress& bd_addr, 
void bta_ag_register(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) {

  /* initialize control block */

  p_scb->reg_services = data.api_register.services;

  p_scb->serv_sec_mask = data.api_register.sec_mask;

  p_scb->serv_sec_mask = BTA_SEC_AUTHENTICATE | BTA_SEC_ENCRYPT;

  p_scb->features = data.api_register.features;

  p_scb->app_id = data.api_register.app_id;
@@ -175,7 +175,7 @@ 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->cli_sec_mask = data.api_open.sec_mask;

  p_scb->cli_sec_mask = BTA_SEC_AUTHENTICATE | BTA_SEC_ENCRYPT;

  p_scb->open_services = p_scb->reg_services;



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

system/bta/ag/bta_ag_api.cc

+4 −7
Original line number Diff line number Diff line
@@ -90,13 +90,11 @@ void BTA_AgDisable() { 
 * Returns          void

 *

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

void BTA_AgRegister(tBTA_SERVICE_MASK services, tBTA_SEC sec_mask,

                    tBTA_AG_FEAT features,

void BTA_AgRegister(tBTA_SERVICE_MASK services, tBTA_AG_FEAT features,

                    const std::vector<std::string>& service_names,

                    uint8_t app_id) {

  do_in_main_thread(

      FROM_HERE, base::Bind(&bta_ag_api_register, services, sec_mask, features,

                            service_names, app_id));

  do_in_main_thread(FROM_HERE, base::Bind(&bta_ag_api_register, services,

                                          features, service_names, app_id));

}



/*******************************************************************************
@@ -128,10 +126,9 @@ void BTA_AgDeregister(uint16_t handle) { 
 * Returns          void

 *

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

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

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

  tBTA_AG_DATA data = {};

  data.api_open.bd_addr = bd_addr;

  data.api_open.sec_mask = sec_mask;

  do_in_main_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

+1 −3
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ enum { 
typedef struct {

  char p_name[2][BTA_SERVICE_NAME_LEN + 1];

  tBTA_SERVICE_MASK services;

  tBTA_SEC sec_mask;

  tBTA_AG_FEAT features;

  uint8_t app_id;

} tBTA_AG_API_REGISTER;
@@ -126,7 +125,6 @@ typedef struct { 
/* data type for BTA_AG_API_OPEN_EVT */

typedef struct {

  RawAddress bd_addr;

  tBTA_SEC sec_mask;

} tBTA_AG_API_OPEN;



/* data type for BTA_AG_API_RESULT_EVT */
@@ -293,7 +291,7 @@ bool bta_ag_hdl_event(BT_HDR* p_msg); 
extern void bta_ag_api_enable(tBTA_AG_CBACK* p_cback);

extern void bta_ag_api_disable();

extern void bta_ag_api_set_active_device(const RawAddress& new_active_device);

extern void bta_ag_api_register(tBTA_SERVICE_MASK services, tBTA_SEC sec_mask,

extern void bta_ag_api_register(tBTA_SERVICE_MASK services,

                                tBTA_AG_FEAT features,

                                const std::vector<std::string>& service_names,

                                uint8_t app_id);

system/bta/ag/bta_ag_main.cc

+2 −5
Original line number Diff line number Diff line
@@ -564,8 +564,7 @@ void bta_ag_resume_open(tBTA_AG_SCB* p_scb) { 
  if (p_scb->state == BTA_AG_INIT_ST) {

    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,

                                           .sec_mask = p_scb->cli_sec_mask}};

    tBTA_AG_DATA open_data = {.api_open = {.bd_addr = p_scb->peer_addr}};

    bta_ag_sm_execute(p_scb, BTA_AG_API_OPEN_EVT, open_data);

  } else {

    VLOG(1) << __func__ << ": device " << p_scb->peer_addr
@@ -653,8 +652,7 @@ void bta_ag_api_disable() { 
 * Returns          void

 *

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

void bta_ag_api_register(tBTA_SERVICE_MASK services, tBTA_SEC sec_mask,

                         tBTA_AG_FEAT features,

void bta_ag_api_register(tBTA_SERVICE_MASK services, tBTA_AG_FEAT features,

                         const std::vector<std::string>& service_names,

                         uint8_t app_id) {

  tBTA_AG_SCB* p_scb = bta_ag_scb_alloc();
@@ -662,7 +660,6 @@ void bta_ag_api_register(tBTA_SERVICE_MASK services, tBTA_SEC sec_mask, 
    APPL_TRACE_DEBUG("bta_ag_api_register: p_scb 0x%08x ", p_scb);

    tBTA_AG_DATA data = {};

    data.api_register.features = features;

    data.api_register.sec_mask = sec_mask;

    data.api_register.services = services;

    data.api_register.app_id = app_id;

    for (int i = 0; i < BTA_AG_NUM_IDX; i++) {

system/bta/include/bta_ag_api.h

+2 −3
Original line number Diff line number Diff line
@@ -500,8 +500,7 @@ void BTA_AgDisable(); 
 * Returns          void

 *

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

void BTA_AgRegister(tBTA_SERVICE_MASK services, tBTA_SEC sec_mask,

                    tBTA_AG_FEAT features,

void BTA_AgRegister(tBTA_SERVICE_MASK services, tBTA_AG_FEAT features,

                    const std::vector<std::string>& service_names,

                    uint8_t app_id);
@@ -530,7 +529,7 @@ void BTA_AgDeregister(uint16_t handle); 
 * Returns          void

 *

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

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

void BTA_AgOpen(uint16_t handle, const RawAddress& bd_addr);



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

 *