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

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

Merge "Don't return GATT services discovered over SDP separately" am: 40e25c71 

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



Change-Id: I2fbe30392efbe55482ac2866de2825896ad74379
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4135781f 40e25c71

system/btif/src/btif_dm.cc

+6 −0
Original line number Diff line number Diff line
@@ -1621,6 +1621,12 @@ static void btif_dm_search_services_evt(tBTA_DM_SEARCH_EVT event, 
        num_properties++;

      }



      /* If services were returned as part of SDP discovery, we will immediately

       * send them with rest of SDP results in BTA_DM_DISC_RES_EVT */

      if (event == BTA_DM_GATT_OVER_SDP_RES_EVT) {

        return;

      }



      /* Send the event to the BTIF */

      GetInterfaceToProfiles()->events->invoke_remote_device_properties_cb(

          BT_STATUS_SUCCESS, bd_addr, num_properties, prop);