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

Commit dbd53cd1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I719194c3,I740fc1a8,I905780a6 into main am: d36d6505 am: ff4906d0 

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



Change-Id: I0d9e3709720554fd4b7d1a96759fbf4e9749bebf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5e5e3453 ff4906d0

system/test/mock/mock_stack_btm_devctl.cc

+0 −5
Original line number Diff line number Diff line
@@ -49,11 +49,6 @@ DEV_CLASS BTM_ReadDeviceClass(void) { 
  inc_func_call_count(__func__);

  return kDevClassEmpty;

}

void BTM_VendorSpecificCommand(uint16_t /* opcode */, uint8_t /* param_len */,

                               uint8_t* /* p_param_buf */, tBTM_VSC_CMPL_CB* /* p_cb */) {

  inc_func_call_count(__func__);

}

void BTM_WritePageTimeout(uint16_t /* timeout */) { inc_func_call_count(__func__); }

void BTM_db_reset(void) { inc_func_call_count(__func__); }

void btm_delete_stored_link_key_complete(uint8_t* /* p */, uint16_t /* evt_len */) {

  inc_func_call_count(__func__);

system/test/mock/mock_stack_btm_inq.cc

+0 −6
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ struct BTM_SetConnectability BTM_SetConnectability; 
struct BTM_SetDiscoverability BTM_SetDiscoverability;

struct BTM_SetInquiryMode BTM_SetInquiryMode;

struct BTM_StartInquiry BTM_StartInquiry;

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;
@@ -74,7 +73,6 @@ tBTM_STATUS BTM_SetConnectability::return_value = BTM_SUCCESS; 
tBTM_STATUS BTM_SetDiscoverability::return_value = BTM_SUCCESS;

tBTM_STATUS BTM_SetInquiryMode::return_value = BTM_SUCCESS;

tBTM_STATUS BTM_StartInquiry::return_value = BTM_SUCCESS;

tBTM_STATUS BTM_WriteEIR::return_value = BTM_SUCCESS;

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;
@@ -120,10 +118,6 @@ tBTM_STATUS BTM_StartInquiry(tBTM_INQ_RESULTS_CB* p_results_cb, tBTM_CMPL_CB* p_ 
  inc_func_call_count(__func__);

  return test::mock::stack_btm_inq::BTM_StartInquiry(p_results_cb, p_cmpl_cb);

}

tBTM_STATUS BTM_WriteEIR(BT_HDR* p_buff) {

  inc_func_call_count(__func__);

  return test::mock::stack_btm_inq::BTM_WriteEIR(p_buff);

}

void btm_clear_all_pending_le_entry(void) {

  inc_func_call_count(__func__);

  test::mock::stack_btm_inq::btm_clear_all_pending_le_entry();

system/test/mock/mock_stack_btm_inq.h

+0 −11
Original line number Diff line number Diff line
@@ -143,17 +143,6 @@ struct BTM_StartInquiry { 
};

extern struct BTM_StartInquiry BTM_StartInquiry;



// Name: BTM_WriteEIR

// Params: BT_HDR* p_buff

// Return: tBTM_STATUS

struct BTM_WriteEIR {

  static tBTM_STATUS return_value;

  std::function<tBTM_STATUS(BT_HDR* p_buff)> body{

          [](BT_HDR* /* p_buff */) { return return_value; }};

  tBTM_STATUS operator()(BT_HDR* p_buff) { return body(p_buff); }

};

extern struct BTM_WriteEIR BTM_WriteEIR;



// Name: btm_clear_all_pending_le_entry

// Params: void

// Return: void