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

Commit dd35866d authored by Zach Johnson's avatar Zach Johnson
Browse files

BTM_ReadDiscoverability is never used now 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I96781ecd6ebd149b2a6e5d91b803f49cc675db9c
parent 63717d5a

system/main/shim/btm_api.cc

+0 −11
Original line number Diff line number Diff line
@@ -451,17 +451,6 @@ tBTM_STATUS bluetooth::shim::BTM_SetInquiryMode(uint8_t inquiry_mode) { 
  return BTM_SUCCESS;

}



uint16_t bluetooth::shim::BTM_ReadDiscoverability(uint16_t* p_window,

                                                  uint16_t* p_interval) {

  DiscoverabilityState state =

      Stack::GetInstance()->GetBtm()->GetClassicDiscoverabilityState();



  if (p_interval) *p_interval = state.interval;

  if (p_window) *p_window = state.window;



  return state.mode;

}



tBTM_STATUS bluetooth::shim::BTM_SetConnectability(uint16_t page_mode,

                                                   uint16_t window,

                                                   uint16_t interval) {

system/main/shim/btm_api.h

+0 −16
Original line number Diff line number Diff line
@@ -118,22 +118,6 @@ void BTM_EnableInterlacedPageScan(); 
 ******************************************************************************/

tBTM_STATUS BTM_SetInquiryMode(uint8_t mode);



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

 *

 * Function         BTM_ReadDiscoverability

 *

 * Description      This function is called to read the current discoverability

 *                  mode of the device.

 *

 * Output Params:   p_window - current inquiry scan duration

 *                  p_interval - current inquiry scan interval

 *

 * Returns          BTM_NON_DISCOVERABLE, BTM_LIMITED_DISCOVERABLE, or

 *                  BTM_GENERAL_DISCOVERABLE

 *

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

uint16_t BTM_ReadDiscoverability(uint16_t* p_window, uint16_t* p_interval);



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

 *

 * Function         BTM_SetConnectability

system/stack/btm/btm_inq.cc

+0 −27
Original line number Diff line number Diff line
@@ -307,33 +307,6 @@ tBTM_STATUS BTM_SetInquiryMode(uint8_t mode) { 
  return (BTM_SUCCESS);

}



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

 *

 * Function         BTM_ReadDiscoverability

 *

 * Description      This function is called to read the current discoverability

 *                  mode of the device.

 *

 * Output Params:   p_window - current inquiry scan duration

 *                  p_interval - current inquiry scan interval

 *

 * Returns          BTM_NON_DISCOVERABLE, BTM_LIMITED_DISCOVERABLE, or

 *                  BTM_GENERAL_DISCOVERABLE

 *

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

uint16_t BTM_ReadDiscoverability(uint16_t* p_window, uint16_t* p_interval) {

  if (bluetooth::shim::is_gd_shim_enabled()) {

    return bluetooth::shim::BTM_ReadDiscoverability(p_window, p_interval);

  }



  BTM_TRACE_API("BTM_ReadDiscoverability");

  if (p_window) *p_window = btm_cb.btm_inq_vars.inq_scan_window;



  if (p_interval) *p_interval = btm_cb.btm_inq_vars.inq_scan_period;



  return (btm_cb.btm_inq_vars.discoverable_mode);

}



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

 *

 * Function         BTM_SetConnectability

system/stack/include/btm_api.h

+0 −16
Original line number Diff line number Diff line
@@ -251,22 +251,6 @@ tBTM_STATUS BTM_EnableTestMode(void); 
 ******************************************************************************/

tBTM_STATUS BTM_SetDiscoverability(uint16_t inq_mode);



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

 *

 * Function         BTM_ReadDiscoverability

 *

 * Description      This function is called to read the current discoverability

 *                  mode of the device.

 *

 * Output Params:   p_window - current inquiry scan duration

 *                  p_interval - current inquiry scan interval

 *

 * Returns          BTM_NON_DISCOVERABLE, BTM_LIMITED_DISCOVERABLE, or

 *                  BTM_GENERAL_DISCOVERABLE

 *

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

uint16_t BTM_ReadDiscoverability(uint16_t* p_window, uint16_t* p_interval);



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

 *

 * Function         BTM_StartInquiry

system/stack/test/ble_advertiser_test.cc

+1 −4
Original line number Diff line number Diff line
@@ -44,9 +44,6 @@ const int num_adv_instances = 16; 
 * whole stack. They will be removed, or changed into mocks one by one in the

 * future, as the refactoring progresses */

bool BTM_BleLocalPrivacyEnabled() { return true; }

uint16_t BTM_ReadDiscoverability(uint16_t* p_window, uint16_t* p_interval) {

  return true;

}

void btm_acl_update_conn_addr(uint16_t conn_handle, const RawAddress& address) {

}

void btm_gen_resolvable_private_addr(