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

Commit db092f14 authored by Chris Manton's avatar Chris Manton
Browse files

stack::btm::tBTM_INQUIRY_VAR_ST Ensure initialized 

Bug: 314265782
Test: atest net_test_stack
Flag: EXEMPT, mechanical refactor

Change-Id: Ia6263313aeaf77f620eef0f485a5c3e4be400df5
parent 82d00ce6

system/stack/btm/neighbor_inquiry.h

+27 −0
Original line number Original line Diff line number Diff line
@@ -265,10 +265,37 @@ struct tBTM_INQUIRY_VAR_ST { 
  bool no_inc_ssp;    /* true, to stop inquiry on incoming SSP */

  bool no_inc_ssp;    /* true, to stop inquiry on incoming SSP */





  void Init() {

  void Init() {

    p_remname_cmpl_cb = nullptr;



    alarm_free(remote_name_timer);

    alarm_free(remote_name_timer);

    alarm_free(classic_inquiry_timer);

    alarm_free(classic_inquiry_timer);

    remote_name_timer = alarm_new("btm_inq.remote_name_timer");

    remote_name_timer = alarm_new("btm_inq.remote_name_timer");

    classic_inquiry_timer = alarm_new("btm_inq.classic_inquiry_timer");

    classic_inquiry_timer = alarm_new("btm_inq.classic_inquiry_timer");



    discoverable_mode = BTM_NON_DISCOVERABLE;

    connectable_mode = BTM_NON_CONNECTABLE;



    page_scan_window = HCI_DEF_PAGESCAN_WINDOW;

    page_scan_period = HCI_DEF_PAGESCAN_INTERVAL;

    inq_scan_window = HCI_DEF_INQUIRYSCAN_WINDOW;

    inq_scan_period = HCI_DEF_INQUIRYSCAN_INTERVAL;

    inq_scan_type = BTM_SCAN_TYPE_STANDARD;

    page_scan_type = HCI_DEF_SCAN_TYPE;



    remname_bda = {};

    remname_active = false;



    p_inq_cmpl_cb = nullptr;

    p_inq_results_cb = nullptr;



    inq_counter = 0;

    inqparms = {};

    inq_cmpl_info = {};



    per_min_delay = 0;

    per_max_delay = 0;

    state = BTM_INQ_INACTIVE_STATE;

    inq_active = 0;

    no_inc_ssp = BTM_NO_SSP_ON_INQUIRY;

    no_inc_ssp = BTM_NO_SSP_ON_INQUIRY;

  }

  }

  void Free() {

  void Free() {

system/stack/test/btm/stack_btm_test.cc

+4 −0
Original line number Original line Diff line number Diff line
@@ -300,3 +300,7 @@ TEST_F(StackBtmWithInitFreeTest, is_disconnect_reason_valid) { 
      ASSERT_FALSE(is_disconnect_reason_valid(reason));

      ASSERT_FALSE(is_disconnect_reason_valid(reason));

  }

  }

}

}



TEST_F(StackBtmWithInitFreeTest, Init) {

  ASSERT_FALSE(btm_cb.btm_inq_vars.remname_active);

}