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

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

Inline always 0 parameters 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I5b615bb3f05bba1c461d3c8c3edcff2bc0dc658d
parent e49a5b02

system/bta/dm/bta_dm_act.cc

+4 −4
Original line number Diff line number Diff line
@@ -410,8 +410,8 @@ void bta_dm_disable() { 
  /* disable all active subsystems */

  bta_sys_disable();



  BTM_SetDiscoverability(BTM_NON_DISCOVERABLE, 0, 0);

  BTM_SetConnectability(BTM_NON_CONNECTABLE, 0, 0);

  BTM_SetDiscoverability(BTM_NON_DISCOVERABLE);

  BTM_SetConnectability(BTM_NON_CONNECTABLE);



  bta_dm_disable_pm();

  bta_dm_disable_search_and_disc();
@@ -513,8 +513,8 @@ bool BTA_DmSetVisibility(bt_scan_mode_t mode) { 
      return false;

  }



  BTM_SetDiscoverability(disc_mode_param, 0, 0);

  BTM_SetConnectability(conn_mode_param, 0, 0);

  BTM_SetDiscoverability(disc_mode_param);

  BTM_SetConnectability(conn_mode_param);

  return true;

}

system/stack/btm/btm_devctl.cc

+2 −2
Original line number Diff line number Diff line
@@ -609,12 +609,12 @@ tBTM_STATUS BTM_EnableTestMode(void) { 
                              HCI_FILTER_COND_NEW_DEVICE, &cond, sizeof(cond));



  /* put device to connectable mode */

  if (BTM_SetConnectability(BTM_CONNECTABLE, 0, 0) != BTM_SUCCESS) {

  if (BTM_SetConnectability(BTM_CONNECTABLE) != BTM_SUCCESS) {

    return BTM_NO_RESOURCES;

  }



  /* put device to discoverable mode */

  if (BTM_SetDiscoverability(BTM_GENERAL_DISCOVERABLE, 0, 0) != BTM_SUCCESS) {

  if (BTM_SetDiscoverability(BTM_GENERAL_DISCOVERABLE) != BTM_SUCCESS) {

    return BTM_NO_RESOURCES;

  }

system/stack/btm/btm_inq.cc

+8 −6
Original line number Diff line number Diff line
@@ -150,10 +150,9 @@ void SendRemoteNameRequest(const RawAddress& raw_address) { 
 *                  BTM_WRONG_MODE if the device is not up.

 *

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

tBTM_STATUS BTM_SetDiscoverability(uint16_t inq_mode, uint16_t window,

                                   uint16_t interval) {

tBTM_STATUS BTM_SetDiscoverability(uint16_t inq_mode) {

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

    return bluetooth::shim::BTM_SetDiscoverability(inq_mode, window, interval);

    return bluetooth::shim::BTM_SetDiscoverability(inq_mode, 0, 0);

  }



  uint8_t scan_mode = 0;
@@ -164,6 +163,8 @@ tBTM_STATUS BTM_SetDiscoverability(uint16_t inq_mode, uint16_t window, 
  LAP temp_lap[2];

  bool is_limited;

  bool cod_limited;

  uint16_t window = 0;

  uint16_t interval = 0;



  BTM_TRACE_API("BTM_SetDiscoverability");

  if (controller_get_interface()->supports_ble()) {
@@ -365,13 +366,14 @@ uint16_t BTM_ReadDiscoverability(uint16_t* p_window, uint16_t* p_interval) { 
 *                  BTM_WRONG_MODE if the device is not up.

 *

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

tBTM_STATUS BTM_SetConnectability(uint16_t page_mode, uint16_t window,

                                  uint16_t interval) {

tBTM_STATUS BTM_SetConnectability(uint16_t page_mode) {

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

    return bluetooth::shim::BTM_SetConnectability(page_mode, window, interval);

    return bluetooth::shim::BTM_SetConnectability(page_mode, 0, 0);

  }



  uint8_t scan_mode = 0;

  uint16_t window = 0;

  uint16_t interval = 0;

  tBTM_INQUIRY_VAR_ST* p_inq = &btm_cb.btm_inq_vars;



  BTM_TRACE_API("BTM_SetConnectability");

system/stack/include/btm_api.h

+2 −4
Original line number Diff line number Diff line
@@ -249,8 +249,7 @@ tBTM_STATUS BTM_EnableTestMode(void); 
 *                  BTM_WRONG_MODE if the device is not up.

 *

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

tBTM_STATUS BTM_SetDiscoverability(uint16_t inq_mode, uint16_t window,

                                   uint16_t interval);

tBTM_STATUS BTM_SetDiscoverability(uint16_t inq_mode);



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

 *
@@ -340,8 +339,7 @@ void BTM_CancelInquiry(void); 
 *                  BTM_WRONG_MODE if the device is not up.

 *

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

tBTM_STATUS BTM_SetConnectability(uint16_t page_mode, uint16_t window,

                                  uint16_t interval);

tBTM_STATUS BTM_SetConnectability(uint16_t page_mode);



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

 *