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

Commit 6d159107 authored by Chris Manton's avatar Chris Manton
Browse files

mock: [51/63] Remove BTM_SetConsolidationCallback 

Use get_btm_client_interface() instead

Bug: 352129816
Test: m .
Flag: EXEMPT, Test infrastructure

Change-Id: I855bad238f669b68ac7e15951b597e04c11553e9
parent 642afe85

system/bta/dm/bta_dm_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ void BTA_dm_init() { 
  /* if UUID list is not provided as static data */

  bta_sys_eir_register(bta_dm_eir_update_uuid);

  bta_sys_cust_eir_register(bta_dm_eir_update_cust_uuid);

  BTM_SetConsolidationCallback(bta_dm_consolidate);

  get_btm_client_interface().ble.BTM_SetConsolidationCallback(bta_dm_consolidate);

}



/** Enables bluetooth device under test mode */

system/test/mock/mock_stack_btm_dev.cc

+0 −3
Original line number Diff line number Diff line
@@ -95,9 +95,6 @@ std::vector<tBTM_SEC_DEV_REC*> btm_get_sec_dev_rec() { 
  inc_func_call_count(__func__);

  return {};

}



void BTM_SetConsolidationCallback(BTM_CONSOLIDATION_CB* /* cb */) { inc_func_call_count(__func__); }



bool BTM_Sec_AddressKnown(const RawAddress& address) {

  inc_func_call_count(__func__);

  return test::mock::stack_btm_dev::BTM_Sec_AddressKnown(address);