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

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

Merge "make is_handle_equal static" into main

parents 4eacaa68 201159dd

system/stack/btm/btm_dev.cc

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ bool btm_dev_support_role_switch(const RawAddress& bd_addr) { 
  return false;

}



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

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

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

  uint16_t* handle = static_cast<uint16_t*>(context);

system/test/mock/mock_stack_btm_dev.cc

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

  return false;

}

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

  inc_func_call_count(__func__);

  return false;

}

const char* BTM_SecReadDevName(const RawAddress& /* bd_addr */) {

  inc_func_call_count(__func__);

  return nullptr;