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

Commit fbdf2c90 authored by Archie Pusaka's avatar Archie Pusaka Committed by Automerger Merge Worker
Browse files

Merge "Don't invoke search complete when cancelling remote name request" into main am: f8c88d0b 

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



Change-Id: I2224ff7132d285d8501e7e235d37904cc9e4d587
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 329580e6 f8c88d0b

system/bta/dm/bta_dm_disc.cc

+8 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <cstdint>

#include <vector>



#include "bta/dm/bta_dm_disc.h"

#include "android_bluetooth_flags.h"

#include "bta/dm/bta_dm_disc_int.h"

#include "bta/include/bta_gatt_api.h"

#include "bta/include/bta_sdp_api.h"
@@ -310,7 +310,13 @@ static void bta_dm_search_cancel() { 
     active */

  else if (!bta_dm_search_cb.name_discover_done) {

    get_btm_client_interface().peer.BTM_CancelRemoteDeviceName();

#ifndef TARGET_FLOSS

    /* bta_dm_search_cmpl is called when receiving the remote name cancel evt */

    if (!IS_FLAG_ENABLED(

            bta_dm_defer_device_discovery_state_change_until_rnr_complete)) {

      bta_dm_search_cmpl();

    }

#endif

  } else {

    bta_dm_inq_cmpl(0);

  }