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

Commit 2770e354 authored by Hui Peng's avatar Hui Peng
Browse files

Remove mocks of btm_initiate_rem_name 

Bug: 301661850
Test: m com.android.btservices
Flag: EXEMPT, no-op
Change-Id: I0b17d4621a2b520674a4b2d73d6e2032d2136840
parent cfaf1d39

system/test/mock/mock_stack_btm_inq.cc

+0 −9
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ struct SendRemoteNameRequest SendRemoteNameRequest; 
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_initiate_rem_name btm_initiate_rem_name;

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;
@@ -101,7 +100,6 @@ tBTM_STATUS BTM_SetDiscoverability::return_value = 0; 
tBTM_STATUS BTM_SetInquiryMode::return_value = 0;

tBTM_STATUS BTM_StartInquiry::return_value = 0;

tBTM_STATUS BTM_WriteEIR::return_value = 0;

tBTM_STATUS btm_initiate_rem_name::return_value = 0;

tINQ_DB_ENT* btm_inq_db_find::return_value = nullptr;

tINQ_DB_ENT* btm_inq_db_new::return_value = nullptr;

bool btm_inq_find_bdaddr::return_value = false;
@@ -218,13 +216,6 @@ void btm_clr_inq_result_flt(void) { 
  inc_func_call_count(__func__);

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

}

tBTM_STATUS btm_initiate_rem_name(const RawAddress& remote_bda, uint8_t origin,

                                  uint64_t timeout_ms,

                                  tBTM_NAME_CMPL_CB* p_cb) {

  inc_func_call_count(__func__);

  return test::mock::stack_btm_inq::btm_initiate_rem_name(remote_bda, origin,

                                                          timeout_ms, p_cb);

}

void btm_inq_clear_ssp(void) {

  inc_func_call_count(__func__);

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

system/test/mock/mock_stack_btm_inq.h

+0 −17
Original line number Diff line number Diff line
@@ -328,23 +328,6 @@ struct btm_clr_inq_result_flt { 
};

extern struct btm_clr_inq_result_flt btm_clr_inq_result_flt;



// Name: btm_initiate_rem_name

// Params: const RawAddress& remote_bda, uint8_t origin, uint64_t timeout_ms,

// tBTM_NAME_CMPL_CB* p_cb Return: tBTM_STATUS

struct btm_initiate_rem_name {

  static tBTM_STATUS return_value;

  std::function<tBTM_STATUS(const RawAddress& remote_bda, uint8_t origin,

                            uint64_t timeout_ms, tBTM_NAME_CMPL_CB* p_cb)>

      body{[](const RawAddress& /* remote_bda */, uint8_t /* origin */,

              uint64_t /* timeout_ms */,

              tBTM_NAME_CMPL_CB* /* p_cb */) { return return_value; }};

  tBTM_STATUS operator()(const RawAddress& remote_bda, uint8_t origin,

                         uint64_t timeout_ms, tBTM_NAME_CMPL_CB* p_cb) {

    return body(remote_bda, origin, timeout_ms, p_cb);

  };

};

extern struct btm_initiate_rem_name btm_initiate_rem_name;



// Name: btm_inq_clear_ssp

// Params: void

// Return: void