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

Commit 42fd028d authored by Chris Manton's avatar Chris Manton
Browse files

mock: [38/63] Remove BTM_ReadLocalDeviceName 

Use get_btm_client_interface() instead

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

Change-Id: Ib7e57c702c584b564cda8a0565137d9d176541d5
parent f2055a3c

system/bta/dm/bta_dm_act.cc

+2 −1
Original line number Original line Diff line number Diff line
@@ -1243,7 +1243,8 @@ static void bta_dm_set_eir(char* local_name) { 




  /* if local name is not provided, get it from controller */

  /* if local name is not provided, get it from controller */

  if (local_name == NULL) {

  if (local_name == NULL) {

    if (BTM_ReadLocalDeviceName((const char**)&local_name) != BTM_SUCCESS) {

    if (get_btm_client_interface().local.BTM_ReadLocalDeviceName((const char**)&local_name) !=

        BTM_SUCCESS) {

      log::error("Fail to read local device name for EIR");

      log::error("Fail to read local device name for EIR");

    }

    }

  }

  }

system/test/mock/mock_stack_btm_devctl.cc

+0 −4
Original line number Original line Diff line number Diff line
@@ -52,10 +52,6 @@ tBTM_STATUS BTM_EnableTestMode(void) { 
  inc_func_call_count(__func__);

  inc_func_call_count(__func__);

  return BTM_SUCCESS;

  return BTM_SUCCESS;

}

}

tBTM_STATUS BTM_ReadLocalDeviceName(const char** /* p_name */) {

  inc_func_call_count(__func__);

  return BTM_SUCCESS;

}

tBTM_STATUS BTM_ReadLocalDeviceNameFromController(tBTM_CMPL_CB* /* p_rln_cmpl_cback */) {

tBTM_STATUS BTM_ReadLocalDeviceNameFromController(tBTM_CMPL_CB* /* p_rln_cmpl_cback */) {

  inc_func_call_count(__func__);

  inc_func_call_count(__func__);

  return BTM_SUCCESS;

  return BTM_SUCCESS;