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

Commit ed2d2958 authored by Hui Peng's avatar Hui Peng Committed by Gerrit Code Review
Browse files

Merge "[Invisalign2] Use btm_sec_find_dev_by_sec_state in... 

Merge "[Invisalign2] Use btm_sec_find_dev_by_sec_state in btm_sec_rmt_name_request_complete" into main
parents ac31258e 55ad76d4

system/stack/btm/btm_sec.cc

+2 −13
Original line number Diff line number Diff line
@@ -2282,15 +2282,6 @@ static tBTM_STATUS btm_sec_dd_create_conn(tBTM_SEC_DEV_REC* p_dev_rec) { 
  return (BTM_CMD_STARTED);

}



bool is_state_getting_name(void* data, void* context) {

  tBTM_SEC_DEV_REC* p_dev_rec = static_cast<tBTM_SEC_DEV_REC*>(data);



  if (p_dev_rec->sec_state == BTM_SEC_STATE_GETTING_NAME) {

    return false;

  }

  return true;

}



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

 *

 * Function         btm_sec_rmt_name_request_complete
@@ -2326,10 +2317,8 @@ void btm_sec_rmt_name_request_complete(const RawAddress* p_bd_addr, 
    LOG_INFO(

        "Remote read request complete with no address so searching device "

        "database");

    list_node_t* node =

        list_foreach(btm_sec_cb.sec_dev_rec, is_state_getting_name, NULL);

    if (node != NULL) {

      p_dev_rec = static_cast<tBTM_SEC_DEV_REC*>(list_node(node));

    p_dev_rec = btm_sec_find_dev_by_sec_state(BTM_SEC_STATE_GETTING_NAME);

    if (p_dev_rec) {

      p_bd_addr = &p_dev_rec->bd_addr;

    }

  }

system/stack/btm/btm_sec.h

+0 −2
Original line number Diff line number Diff line
@@ -493,8 +493,6 @@ void btm_sec_dev_reset(void); 
 ******************************************************************************/

void btm_sec_abort_access_req(const RawAddress& bd_addr);



bool is_state_getting_name(void* data, void* context);



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

 *

 * Function         btm_sec_rmt_name_request_complete

system/test/mock/mock_stack_btm_sec.cc

+0 −7
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ struct btm_sec_role_changed btm_sec_role_changed; 
struct btm_sec_set_peer_sec_caps btm_sec_set_peer_sec_caps;

struct btm_sec_update_clock_offset btm_sec_update_clock_offset;

struct btm_simple_pair_complete btm_simple_pair_complete;

struct is_state_getting_name is_state_getting_name;



struct BTM_IsRemoteNameKnown BTM_IsRemoteNameKnown;
@@ -151,7 +150,6 @@ bool btm_sec_is_a_bonded_dev::return_value = false; 
tBTM_STATUS btm_sec_l2cap_access_req::return_value = 0;

tBTM_STATUS btm_sec_l2cap_access_req_by_requirement::return_value = 0;

tBTM_STATUS btm_sec_mx_access_request::return_value = 0;

bool is_state_getting_name::return_value = false;



bool BTM_IsRemoteNameKnown::return_value = false;
@@ -484,11 +482,6 @@ void btm_simple_pair_complete(const RawAddress bd_addr, uint8_t status) { 
  inc_func_call_count(__func__);

  test::mock::stack_btm_sec::btm_simple_pair_complete(bd_addr, status);

}

bool is_state_getting_name(void* data, void* context) {

  inc_func_call_count(__func__);

  return test::mock::stack_btm_sec::is_state_getting_name(data, context);

}



bool BTM_IsRemoteNameKnown(const RawAddress& bd_addr, tBT_TRANSPORT transport) {

  inc_func_call_count(__func__);

  return test::mock::stack_btm_sec::BTM_IsRemoteNameKnown(bd_addr, transport);

system/test/mock/mock_stack_btm_sec.h

+0 −11
Original line number Diff line number Diff line
@@ -914,17 +914,6 @@ struct btm_simple_pair_complete { 
};

extern struct btm_simple_pair_complete btm_simple_pair_complete;



// Name: is_state_getting_name

// Params: void* data, void* context

// Return: bool

struct is_state_getting_name {

  static bool return_value;

  std::function<bool(void* data, void* context)> body{

      [](void* data, void* context) { return return_value; }};

  bool operator()(void* data, void* context) { return body(data, context); };

};

extern struct is_state_getting_name is_state_getting_name;



// Name: BTM_IsRemoteNameKnown

// Params: const RawAddress& bd_addr, tBT_TRANSPORT transport

// Return: bool