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

Commit 2eb8b4a6 authored by Chris Manton's avatar Chris Manton
Browse files

Stat-ify bta::dm::bta_dm_init_cb 

Bug: 224999611
Test: mma .

Change-Id: I4d83a112383e2bde6c350db02db29944469de0b4
parent 9b30c6ad

system/bta/dm/bta_dm_act.cc

+3 −1
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ tBTA_DM_STATE bta_dm_search_get_state() { return bta_dm_search_cb.state; } 
 * Returns          void

 *

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

void bta_dm_init_cb(void) {

static void bta_dm_init_cb(void) {

  bta_dm_cb = {};

  bta_dm_cb.disable_timer = alarm_new("bta_dm.disable_timer");

  bta_dm_cb.switch_delay_timer = alarm_new("bta_dm.switch_delay_timer");
@@ -4801,6 +4801,8 @@ tBTM_STATUS bta_dm_sp_cback(tBTM_SP_EVT event, tBTM_SP_EVT_DATA* p_data) { 


void btm_set_local_io_caps(uint8_t io_caps) { ::btm_local_io_caps = io_caps; }



void bta_dm_init_cb() { ::bta_dm_init_cb(); }



}  // namespace testing

}  // namespace legacy

}  // namespace bluetooth

system/bta/dm/bta_dm_int.h

+0 −1
Original line number Diff line number Diff line
@@ -511,7 +511,6 @@ void bta_dm_search_sm_disable(void); 


void bta_dm_enable(tBTA_DM_SEC_CBACK*);

void bta_dm_disable();

void bta_dm_init_cb(void);

void bta_dm_deinit_cb(void);

void bta_dm_ble_sirk_sec_cb_register(tBTA_DM_SEC_CBACK*);

void bta_dm_ble_sirk_confirm_device_reply(const RawAddress& bd_addr,

system/bta/test/bta_dm_test.cc

+11 −1
Original line number Diff line number Diff line
@@ -72,6 +72,16 @@ const tBTA_SYS_REG bta_dm_search_reg = {bta_dm_search_sm_execute, 


}  // namespace



namespace bluetooth {

namespace legacy {

namespace testing {



void bta_dm_init_cb();



}  // namespace testing

}  // namespace legacy

}  // namespace bluetooth



class BtaDmTest : public testing::Test {

 protected:

  void SetUp() override {
@@ -82,7 +92,7 @@ class BtaDmTest : public testing::Test { 
    post_on_bt_main([]() { LOG_INFO("Main thread started up"); });



    bta_sys_register(BTA_ID_DM_SEARCH, &bta_dm_search_reg);

    bta_dm_init_cb();

    bluetooth::legacy::testing::bta_dm_init_cb();



    for (int i = 0; i < BTA_DM_NUM_PM_TIMER; i++) {

      for (int j = 0; j < BTA_DM_PM_MODE_TIMER_MAX; j++) {

system/test/mock/mock_bta_dm_act.cc

+0 −5
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ struct bta_dm_enable bta_dm_enable; 
struct bta_dm_encrypt_cback bta_dm_encrypt_cback;

struct bta_dm_execute_queued_request bta_dm_execute_queued_request;

struct bta_dm_free_sdp_db bta_dm_free_sdp_db;

struct bta_dm_init_cb bta_dm_init_cb;

struct bta_dm_inq_cmpl bta_dm_inq_cmpl;

struct bta_dm_is_search_request_queued bta_dm_is_search_request_queued;

struct bta_dm_pin_reply bta_dm_pin_reply;
@@ -289,10 +288,6 @@ void bta_dm_free_sdp_db() { 
  inc_func_call_count(__func__);

  test::mock::bta_dm_act::bta_dm_free_sdp_db();

}

void bta_dm_init_cb(void) {

  inc_func_call_count(__func__);

  test::mock::bta_dm_act::bta_dm_init_cb();

}

void bta_dm_inq_cmpl(uint8_t num) {

  inc_func_call_count(__func__);

  test::mock::bta_dm_act::bta_dm_inq_cmpl(num);

system/test/mock/mock_bta_dm_act.h

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

extern struct bta_dm_free_sdp_db bta_dm_free_sdp_db;



// Name: bta_dm_init_cb

// Params: void

// Return: void

struct bta_dm_init_cb {

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

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

};

extern struct bta_dm_init_cb bta_dm_init_cb;



// Name: bta_dm_inq_cmpl

// Params: uint8_t num

// Return: void