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

Commit e42560a7 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Automerger Merge Worker
Browse files

Fix LE service discovery event cancelling SDP discovery am: ec85141f 

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



Change-Id: Iaf38ad1c0ef90e6a658c37c6f3120b5e6272fccd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9f2de5ff ec85141f

system/bta/dm/bta_dm_disc.cc

+7 −1
Original line number Diff line number Diff line
@@ -585,7 +585,13 @@ static void bta_dm_gatt_disc_complete(uint16_t conn_id, tGATT_STATUS status) { 
    } else {

      bta_dm_discovery_cb.conn_id = GATT_INVALID_CONN_ID;

    }

    if (com::android::bluetooth::flags::fix_le_evt_cancelling_sdp_discovery() &&

        (bta_dm_discovery_cb.transports & BT_TRANSPORT_BR_EDR)) {

      log::info("classic discovery still pending {}", bta_dm_discovery_cb.peer_bdaddr);

      return;

    } else {

      bta_dm_discovery_set_state(BTA_DM_DISCOVER_IDLE);

    }

    bta_dm_execute_queued_discovery_request();

  }

}