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

Commit 1fb4e1ed authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Gerrit Code Review
Browse files

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

parents 40e25c71 b454499c

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,