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

Commit 357b6ae8 authored by Chris Manton's avatar Chris Manton
Browse files

Stat-ify bta::dm::bta_dm_deinit_cb 

Bug: 224999611
Test: mma .

Change-Id: I985be320855b71cff16ff3b1afa8f2f3216f9da8
parent 2eb8b4a6

system/bta/dm/bta_dm_act.cc

+2 −1
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ static void bta_dm_init_cb(void) { 
 * Returns          void

 *

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

void bta_dm_deinit_cb(void) {

static void bta_dm_deinit_cb(void) {

  /*

   * TODO: Should alarm_free() the bta_dm_cb timers during graceful

   * shutdown.
@@ -4802,6 +4802,7 @@ 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(); }

void bta_dm_deinit_cb() { ::bta_dm_deinit_cb(); }



}  // namespace testing

}  // namespace legacy

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_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,

                                          bool accept);

system/bta/test/bta_dm_test.cc

+2 −1
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ namespace legacy { 
namespace testing {



void bta_dm_init_cb();

void bta_dm_deinit_cb();



}  // namespace testing

}  // namespace legacy
@@ -102,7 +103,7 @@ class BtaDmTest : public testing::Test { 
  }

  void TearDown() override {

    bta_sys_deregister(BTA_ID_DM_SEARCH);

    bta_dm_deinit_cb();

    bluetooth::legacy::testing::bta_dm_deinit_cb();

    post_on_bt_main([]() { LOG_INFO("Main thread shutting down"); });

    main_thread_shut_down();

  }

system/test/mock/mock_bta_dm_act.cc

+0 −5
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ struct bta_dm_ci_rmt_oob_act bta_dm_ci_rmt_oob_act; 
struct bta_dm_close_acl bta_dm_close_acl;

struct bta_dm_close_gatt_conn bta_dm_close_gatt_conn;

struct bta_dm_confirm bta_dm_confirm;

struct bta_dm_deinit_cb bta_dm_deinit_cb;

struct bta_dm_disable bta_dm_disable;

struct bta_dm_disc_result bta_dm_disc_result;

struct bta_dm_remote_name_cmpl bta_dm_remote_name_cmpl;
@@ -242,10 +241,6 @@ void bta_dm_confirm(const RawAddress& bd_addr, bool accept) { 
  inc_func_call_count(__func__);

  test::mock::bta_dm_act::bta_dm_confirm(bd_addr, accept);

}

void bta_dm_deinit_cb(void) {

  inc_func_call_count(__func__);

  test::mock::bta_dm_act::bta_dm_deinit_cb();

}

void bta_dm_disable() {

  inc_func_call_count(__func__);

  test::mock::bta_dm_act::bta_dm_disable();

system/test/mock/mock_bta_dm_act.h

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

extern struct bta_dm_confirm bta_dm_confirm;



// Name: bta_dm_deinit_cb

// Params: void

// Return: void

struct bta_dm_deinit_cb {

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

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

};

extern struct bta_dm_deinit_cb bta_dm_deinit_cb;



// Name: bta_dm_disable

// Params:

// Return: void