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

Commit 8f8f85e7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Check search state when cancel read remote name procedure" into rvc-dev am: 197ed6d4 

Change-Id: I08afd971c1580eea0cdacd018c26fd5208b29e2d
parents 8cfe1f0d 197ed6d4

system/bta/dm/bta_dm_act.cc

+3 −1
Original line number Diff line number Diff line
@@ -1753,7 +1753,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) {