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

Commit 1bfe15ff authored by Henri Chataing's avatar Henri Chataing
Browse files

Remove unused functions btm_inq_db_init, btm_inq_db_free 

Replaced by methods tBTM_INQUIRY_VAR_ST::(Init|Free)

Bug: 331817295
Test: m com.android.btservices
Flag: EXEMPT, dead code removal
Change-Id: I266cc67bab460a510bf6f85db584871133d90919
parent 5036d90b

system/stack/btm/btm_inq.cc

+0 −21
Original line number Diff line number Diff line
@@ -1066,27 +1066,6 @@ void btm_inq_db_reset(void) { 
  return;

}



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

 *

 * Function         btm_inq_db_init

 *

 * Description      This function is called at startup to initialize the inquiry

 *                  database.

 *

 * Returns          void

 *

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

void btm_inq_db_init(void) {

  alarm_free(btm_cb.btm_inq_vars.remote_name_timer);

  btm_cb.btm_inq_vars.remote_name_timer =

      alarm_new("btm_inq.remote_name_timer");

  btm_inq_db_set_inq_by_rssi();

}



void btm_inq_db_free(void) {

  alarm_free(btm_cb.btm_inq_vars.remote_name_timer);

}



void btm_inq_db_set_inq_by_rssi(void) {

  internal_.inq_by_rssi = osi_property_get_bool(PROPERTY_INQ_BY_RSSI, false);

}

system/test/mock/mock_stack_btm_inq.cc

+0 −10
Original line number Diff line number Diff line
@@ -61,8 +61,6 @@ 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_free btm_inq_db_free;

struct btm_inq_db_init btm_inq_db_init;

struct btm_inq_db_new btm_inq_db_new;

struct btm_inq_db_reset btm_inq_db_reset;

struct btm_inq_find_bdaddr btm_inq_find_bdaddr;
@@ -221,14 +219,6 @@ 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);

}

void btm_inq_db_free(void) {

  inc_func_call_count(__func__);

  test::mock::stack_btm_inq::btm_inq_db_free();

}

void btm_inq_db_init(void) {

  inc_func_call_count(__func__);

  test::mock::stack_btm_inq::btm_inq_db_init();

}

tINQ_DB_ENT* btm_inq_db_new(const RawAddress& p_bda, bool is_ble) {

  inc_func_call_count(__func__);

  return test::mock::stack_btm_inq::btm_inq_db_new(p_bda, is_ble);

system/test/mock/mock_stack_btm_inq.h

+0 −18
Original line number Diff line number Diff line
@@ -349,24 +349,6 @@ struct btm_inq_db_find { 
};

extern struct btm_inq_db_find btm_inq_db_find;



// Name: btm_inq_db_free

// Params: void

// Return: void

struct btm_inq_db_free {

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

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

};

extern struct btm_inq_db_free btm_inq_db_free;



// Name: btm_inq_db_init

// Params: void

// Return: void

struct btm_inq_db_init {

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

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

};

extern struct btm_inq_db_init btm_inq_db_init;



// Name: btm_inq_db_new

// Params: const RawAddress& p_bda

// Return: tINQ_DB_ENT*