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

Commit d59c11eb authored by Myles Watson's avatar Myles Watson
Browse files

bt_target.h: Remove no-op btm_inq_stop_on_ssp 

Bug: 327390105
Test: mma -j32
Flag: EXEMPT, build-only change
Change-Id: Idd4fcbb03b96b3ea476c32aa4d7d677d92005d94
parent 42ca9ed2

system/stack/btm/btm_inq.cc

+0 −16
Original line number Diff line number Diff line
@@ -1077,22 +1077,6 @@ void btm_inq_db_set_inq_by_rssi(void) { 
  internal_.inq_by_rssi = osi_property_get_bool(PROPERTY_INQ_BY_RSSI, false);

}



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

 *

 * Function         btm_inq_stop_on_ssp

 *

 * Description      This function is called on incoming SSP

 *

 * Returns          void

 *

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

void btm_inq_stop_on_ssp(void) {

#if (BTM_INQ_DEBUG == TRUE)

  log::verbose("btm_inq_stop_on_ssp: inq_active:0x{:x} state:{} ",

               btm_cb.btm_inq_vars.inq_active, btm_cb.btm_inq_vars.state);

#endif

}



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

 *

 * Function         btm_inq_clear_ssp

system/stack/btm/btm_sec.cc

+0 −4
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ extern tBTM_CB btm_cb; 
  (BTM_SEC_LE_AUTHENTICATED | BTM_SEC_LE_ENCRYPTED | \

   BTM_SEC_LE_LINK_KEY_KNOWN | BTM_SEC_LE_LINK_KEY_AUTHED)



void btm_inq_stop_on_ssp(void);

bool btm_ble_init_pseudo_addr(tBTM_SEC_DEV_REC* p_dev_rec,

                              const RawAddress& new_pseudo_addr);

void bta_dm_remove_device(const RawAddress& bd_addr);
@@ -2646,9 +2645,6 @@ void btm_io_capabilities_rsp(const tBTM_SP_IO_RSP evt_data) { 
    btm_sec_cb.pairing_bda = evt_data.bd_addr;



    btm_sec_cb.change_pairing_state(BTM_PAIR_STATE_INCOMING_SSP);



    /* work around for FW bug */

    btm_inq_stop_on_ssp();

  }



  /* Notify L2CAP to increase timeout */

system/test/mock/mock_stack_btm_inq.cc

+0 −5
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ struct btm_inq_db_reset btm_inq_db_reset; 
struct btm_inq_find_bdaddr btm_inq_find_bdaddr;

struct btm_inq_remote_name_timer_timeout btm_inq_remote_name_timer_timeout;

struct btm_inq_rmt_name_failed_cancelled btm_inq_rmt_name_failed_cancelled;

struct btm_inq_stop_on_ssp btm_inq_stop_on_ssp;

struct btm_process_inq_complete btm_process_inq_complete;

struct btm_process_inq_results btm_process_inq_results;

struct btm_process_remote_name btm_process_remote_name;
@@ -251,10 +250,6 @@ void btm_inq_rmt_name_failed_cancelled(void) { 
  inc_func_call_count(__func__);

  test::mock::stack_btm_inq::btm_inq_rmt_name_failed_cancelled();

}

void btm_inq_stop_on_ssp(void) {

  inc_func_call_count(__func__);

  test::mock::stack_btm_inq::btm_inq_stop_on_ssp();

}

void btm_process_inq_complete(tHCI_STATUS status, uint8_t mode) {

  inc_func_call_count(__func__);

  test::mock::stack_btm_inq::btm_process_inq_complete(status, mode);

system/test/mock/mock_stack_btm_inq.h

+0 −9
Original line number Diff line number Diff line
@@ -420,15 +420,6 @@ struct btm_inq_rmt_name_failed_cancelled { 
extern struct btm_inq_rmt_name_failed_cancelled

    btm_inq_rmt_name_failed_cancelled;



// Name: btm_inq_stop_on_ssp

// Params: void

// Return: void

struct btm_inq_stop_on_ssp {

  std::function<void(void)> body{[](void) {}};

  void operator()(void) { body(); };

};

extern struct btm_inq_stop_on_ssp btm_inq_stop_on_ssp;



// Name: btm_process_inq_complete

// Params: tHCI_STATUS status, uint8_t mode

// Return: void