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

Commit 10ec2a56 authored by Chris Manton's avatar Chris Manton
Browse files

bta: Add bta::dm::disc::tBTA_DM_SEARCH_CB reset fields 

Bug: 309860097
Test: atest net_test_bta

Change-Id: Ia2dbe14b950ff4825804919fc9f191b7a35ac97a
parent 834a62c3

system/bta/dm/bta_dm_act.cc

+0 −1
Original line number Diff line number Diff line
@@ -275,7 +275,6 @@ void BTA_dm_on_hw_on() { 
    get_btm_client_interface().ble.BTM_BleLoadLocalKeys(

        BTA_BLE_LOCAL_KEY_TYPE_ID, (tBTM_BLE_LOCAL_KEYS*)&id_key);

  }

  bta_dm_search_cb.conn_id = GATT_INVALID_CONN_ID;



  btm_dm_sec_init();

  btm_sec_on_hw_on();

system/bta/dm/bta_dm_disc.cc

+3 −0
Original line number Diff line number Diff line
@@ -2386,6 +2386,9 @@ static void bta_dm_disc_reset() { 
  osi_free_and_reset((void**)&bta_dm_search_cb.p_pending_search);

  fixed_queue_free(bta_dm_search_cb.pending_discovery_queue, osi_free);

  bta_dm_search_cb = {};

  bta_dm_search_cb.state = BTA_DM_SEARCH_IDLE;

  bta_dm_search_cb.conn_id = GATT_INVALID_CONN_ID;

  bta_dm_search_cb.transport = BT_TRANSPORT_AUTO;

}



void bta_dm_disc_start(bool delay_close_gatt) {