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

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

Merge "Don't call BTA_DM_DISC_RES_EVT for GATT over LE services" am:... 

Merge "Don't call BTA_DM_DISC_RES_EVT for GATT over LE services" am: 1fb4e1ed am: c09df79a am: c210167e

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



Change-Id: If895e21c5f553f7a222113a8d69202129cf996c6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 82777db2 c210167e

system/bta/dm/bta_dm_act.cc

+8 −3
Original line number Diff line number Diff line
@@ -1401,8 +1401,13 @@ void bta_dm_search_cmpl() { 
void bta_dm_disc_result(tBTA_DM_MSG* p_data) {

  APPL_TRACE_EVENT("%s", __func__);



  /* disc_res.device_type is set only when GATT discovery is finished in

   * bta_dm_gatt_disc_complete */

  bool is_gatt_over_ble = ((p_data->disc_result.result.disc_res.device_type &

                            BT_DEVICE_TYPE_BLE) != 0);



  /* if any BR/EDR service discovery has been done, report the event */

  if ((bta_dm_search_cb.services &

  if (!is_gatt_over_ble && (bta_dm_search_cb.services &

                            ((BTA_ALL_SERVICE_MASK | BTA_USER_SERVICE_MASK) &

                             ~BTA_BLE_SERVICE_MASK)))

    bta_dm_search_cb.p_search_cback(BTA_DM_DISC_RES_EVT,