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

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

Merge "[Invisalign2] Make is_address_equal static" into main

parents b496be50 25faf16b

system/stack/btm/btm_dev.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -366,7 +366,7 @@ tBTM_SEC_DEV_REC* btm_find_dev_by_handle(uint16_t handle) { 
  return NULL;

  return NULL;

}

}





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

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

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

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

  const RawAddress* bd_addr = ((RawAddress*)context);

  const RawAddress* bd_addr = ((RawAddress*)context);

system/stack/btm/btm_dev.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -94,8 +94,6 @@ bool btm_dev_support_role_switch(const RawAddress& bd_addr); 
 ******************************************************************************/

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

tBTM_SEC_DEV_REC* btm_find_dev_by_handle(uint16_t handle);

tBTM_SEC_DEV_REC* btm_find_dev_by_handle(uint16_t handle);





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



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

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

 *

 *

 * Function         btm_find_dev

 * Function         btm_find_dev

system/test/mock/mock_stack_btm_dev.cc

+0 −4
Original line number Original line Diff line number Diff line
@@ -65,10 +65,6 @@ bool btm_set_bond_type_dev(const RawAddress& /* bd_addr */, 
  inc_func_call_count(__func__);

  inc_func_call_count(__func__);

  return false;

  return false;

}

}

bool is_address_equal(void* /* data */, void* /* context */) {

  inc_func_call_count(__func__);

  return false;

}

bool is_handle_equal(void* /* data */, void* /* context */) {

bool is_handle_equal(void* /* data */, void* /* context */) {

  inc_func_call_count(__func__);

  inc_func_call_count(__func__);

  return false;

  return false;