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

Commit c1e8024c authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Check search state when cancel read remote name procedure"

parents f359e5b0 01ba9028

system/bta/dm/bta_dm_act.cc

+3 −1
Original line number Diff line number Diff line
@@ -1754,7 +1754,9 @@ void bta_dm_search_cancel_notify(UNUSED_ATTR tBTA_DM_MSG* p_data) { 
  if (bta_dm_search_cb.p_search_cback) {

    bta_dm_search_cb.p_search_cback(BTA_DM_SEARCH_CANCEL_CMPL_EVT, NULL);

  }

  if (!bta_dm_search_cb.name_discover_done) {

  if (!bta_dm_search_cb.name_discover_done &&

      (bta_dm_search_cb.state == BTA_DM_SEARCH_ACTIVE ||

       bta_dm_search_cb.state == BTA_DM_SEARCH_CANCELLING)) {

    BTM_CancelRemoteDeviceName();

  }

  if (bta_dm_search_cb.gatt_disc_active) {