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

Commit 319eba83 authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge "Fix crash on SDP results" into main am: 3285d053 am: 111a0128 

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



Change-Id: I6ae48c1518b3c369f95a9185d191931fbdb72749
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6aebcea9 111a0128

system/bta/dm/bta_dm_disc.cc

+4 −2
Original line number Diff line number Diff line
@@ -249,9 +249,11 @@ void bta_dm_sdp_finished(RawAddress bda, tBTA_STATUS result, std::vector<bluetoo 


/* Callback from sdp with discovery status */

void bta_dm_sdp_callback(const RawAddress& /* bd_addr */, tSDP_STATUS sdp_status) {

  log::info("{}", bta_dm_state_text(bta_dm_discovery_get_state()));

  bool sdp_pending = bta_dm_discovery_cb.transports & BT_TRANSPORT_BR_EDR;

  log::info("{}, sdp_pending: {}", bta_dm_state_text(bta_dm_discovery_get_state()), sdp_pending);



  if (bta_dm_discovery_get_state() == BTA_DM_DISCOVER_IDLE) {

  if (bta_dm_discovery_get_state() == BTA_DM_DISCOVER_IDLE || !sdp_pending ||

      !bta_dm_discovery_cb.sdp_state) {

    return;

  }