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

Commit f18f5be4 authored by Hui Peng's avatar Hui Peng
Browse files

[Invisalign2] Make is_sec_state_equal static 

Bug: 301661850
Test: mma packages/modules/Bluetooth
Change-Id: I59360e081461b3b2282f01a78bb863b7b6a8ee30
parent 2f6ec4fd

system/stack/btm/btm_sec.cc

+9 −9
Original line number Diff line number Diff line
@@ -227,6 +227,15 @@ static bool btm_dev_16_digit_authenticated(const tBTM_SEC_DEV_REC* p_dev_rec) { 
  return p_dev_rec->sec_flags & BTM_SEC_16_DIGIT_PIN_AUTHED;

}



static bool is_sec_state_equal(void* data, void* context) {

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

  uint8_t* state = static_cast<uint8_t*>(context);



  if (p_dev_rec->sec_state == *state) return false;



  return true;

}



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

 *

 * Function         btm_sec_find_dev_by_sec_state
@@ -4738,15 +4747,6 @@ static void btm_restore_mode(void) { 
  }

}



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

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

  uint8_t* state = static_cast<uint8_t*>(context);



  if (p_dev_rec->sec_state == *state) return false;



  return true;

}



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

 *

 * Function         btm_sec_change_pairing_state

system/stack/btm/btm_sec.h

+0 −2
Original line number Diff line number Diff line
@@ -728,8 +728,6 @@ void btm_sec_update_clock_offset(uint16_t handle, uint16_t clock_offset); 
 ******************************************************************************/

tBTM_SEC_SERV_REC* btm_sec_find_first_serv(bool is_originator, uint16_t psm);



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



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

 *

 * Function         btm_sec_dev_rec_cback_event

system/test/mock/mock_stack_btm_sec.cc

+0 −6
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_sec_state_equal is_sec_state_equal;

struct is_state_getting_name is_state_getting_name;



struct BTM_IsRemoteNameKnown BTM_IsRemoteNameKnown;
@@ -152,7 +151,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_sec_state_equal::return_value = false;

bool is_state_getting_name::return_value = false;



bool BTM_IsRemoteNameKnown::return_value = false;
@@ -486,10 +484,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_sec_state_equal(void* data, void* context) {

  inc_func_call_count(__func__);

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

}

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);

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_sec_state_equal

// Params: void* data, void* context

// Return: bool

struct is_sec_state_equal {

  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_sec_state_equal is_sec_state_equal;



// Name: is_state_getting_name

// Params: void* data, void* context

// Return: bool