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

Commit d67cfcf9 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

stack::btm::btm_inq_clear_ssp Remove unused function am: e4ba9f2c 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3126677



Change-Id: Ia89750da8d4c80ef4e2369f4f60a5c6e2de267b6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3bebde48 e4ba9f2c

system/stack/btm/btm_inq.cc

+0 −11
Original line number Diff line number Diff line
@@ -1061,17 +1061,6 @@ void btm_inq_db_reset(void) { 
  return;

}



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

 *

 * Function         btm_inq_clear_ssp

 *

 * Description      This function is called when pairing_state becomes idle

 *

 * Returns          void

 *

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

void btm_inq_clear_ssp(void) {}



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

 *

 * Function         btm_clr_inq_db

system/stack/btm/btm_sec.cc

+0 −2
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ bool btm_ble_init_pseudo_addr(tBTM_SEC_DEV_REC* p_dev_rec, 
void bta_dm_remove_device(const RawAddress& bd_addr);

void bta_dm_remote_key_missing(const RawAddress bd_addr);

void bta_dm_process_remove_device(const RawAddress& bd_addr);

void btm_inq_clear_ssp(void);



static tBTM_STATUS btm_sec_execute_procedure(tBTM_SEC_DEV_REC* p_dev_rec);

static bool btm_sec_start_get_name(tBTM_SEC_DEV_REC* p_dev_rec);
@@ -4905,7 +4904,6 @@ void tBTM_SEC_CB::change_pairing_state(tBTM_PAIRING_STATE new_state) { 


    btm_restore_mode();

    btm_sec_check_pending_reqs();

    btm_inq_clear_ssp();



    pairing_bda = RawAddress::kAny;

  } else {

system/test/mock/mock_stack_btm_inq.cc

+0 −5
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ struct BTM_WriteEIR BTM_WriteEIR; 
struct btm_clear_all_pending_le_entry btm_clear_all_pending_le_entry;

struct btm_clr_inq_db btm_clr_inq_db;

struct btm_clr_inq_result_flt btm_clr_inq_result_flt;

struct btm_inq_clear_ssp btm_inq_clear_ssp;

struct btm_inq_db_find btm_inq_db_find;

struct btm_inq_db_new btm_inq_db_new;

struct btm_inq_db_reset btm_inq_db_reset;
@@ -206,10 +205,6 @@ void btm_clr_inq_result_flt(void) { 
  inc_func_call_count(__func__);

  test::mock::stack_btm_inq::btm_clr_inq_result_flt();

}

void btm_inq_clear_ssp(void) {

  inc_func_call_count(__func__);

  test::mock::stack_btm_inq::btm_inq_clear_ssp();

}

tINQ_DB_ENT* btm_inq_db_find(const RawAddress& p_bda) {

  inc_func_call_count(__func__);

  return test::mock::stack_btm_inq::btm_inq_db_find(p_bda);

system/test/mock/mock_stack_btm_inq.h

+0 −9
Original line number Diff line number Diff line
@@ -318,15 +318,6 @@ struct btm_clr_inq_result_flt { 
};

extern struct btm_clr_inq_result_flt btm_clr_inq_result_flt;



// Name: btm_inq_clear_ssp

// Params: void

// Return: void

struct btm_inq_clear_ssp {

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

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

};

extern struct btm_inq_clear_ssp btm_inq_clear_ssp;



// Name: btm_inq_db_find

// Params: const RawAddress& p_bda

// Return: tINQ_DB_ENT*