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

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

sdp: Process inflight SDP when device discovery cancel am: 404e51df 

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



Change-Id: Iffd783a224895899acd09d3bb09d59262c476fe8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1af19504 404e51df

system/bta/dm/bta_dm_disc.cc

+4 −1
Original line number Diff line number Diff line
@@ -2340,7 +2340,10 @@ bool bta_dm_search_sm_execute(const BT_HDR_RIGID* p_msg) { 
          break;

        case BTA_DM_API_SEARCH_CANCEL_EVT:

          bta_dm_search_clear_queue();

          if (IS_FLAG_ENABLED(

                  continue_service_discovery_when_cancel_device_discovery)) {

            bta_dm_search_set_state(BTA_DM_SEARCH_CANCELLING);

          }

          bta_dm_search_cancel_notify();

          break;

        case BTA_DM_DISC_CLOSE_TOUT_EVT: