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

Commit 7d2ef30e authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

bta: Properly initialize bta::dm::disc::bta_dm_search_cb am: 100f3d68 

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



Change-Id: I2e2f0b835d9c58792966aea48854a60fe70b6497
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c29646f6 100f3d68

system/bta/dm/bta_dm_disc.cc

+8 −4
Original line number Diff line number Diff line
@@ -2380,15 +2380,19 @@ bool bta_dm_search_sm_execute(const BT_HDR_RIGID* p_msg) { 
  return true;

}



static void bta_dm_disc_init_search_cb(tBTA_DM_SEARCH_CB& bta_dm_search_cb) {

  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;

}



static void bta_dm_disc_reset() {

  alarm_free(bta_dm_search_cb.search_timer);

  alarm_free(bta_dm_search_cb.gatt_close_timer);

  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;

  bta_dm_disc_init_search_cb(::bta_dm_search_cb);

}



void bta_dm_disc_start(bool delay_close_gatt) {