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

Commit a2a0c430 authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Merge bta_dm_service_discovery_cmpl into bta_dm_disc_result 

Bug: 330675788
Bug: 335732980
Flag: com.android.bluetooth.flags.separate_service_and_device_discovery
Test: mma -j32
Change-Id: I6cc310425140701b399e547e72fc8c79a5587565
parent 8aa0bf95

system/bta/dm/bta_dm_disc.cc

+29 −33
Original line number Diff line number Diff line
@@ -589,7 +589,35 @@ static void bta_dm_read_dis_cmpl(const RawAddress& addr, 
}

#endif



static void bta_dm_service_discovery_cmpl() {

/*******************************************************************************

 *

 * Function         bta_dm_disc_result

 *

 * Description      Service discovery result when discovering services on a

 *                  device

 *

 * Returns          void

 *

 ******************************************************************************/

static void bta_dm_disc_result(tBTA_DM_SVC_RES& disc_result) {

  log::verbose("");



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

   * bta_dm_gatt_disc_complete */

  bool is_gatt_over_ble = ((disc_result.device_type & BT_DEVICE_TYPE_BLE) != 0);



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

  if (!is_gatt_over_ble) {

    auto& r = disc_result;

    bta_dm_discovery_cb.service_search_cbacks.on_service_discovery_results(

        r.bd_addr, r.services, r.device_type, r.uuids, r.result, r.hci_status);

  } else {

    GAP_BleReadPeerPrefConnParams(bta_dm_discovery_cb.peer_bdaddr);

  }



  get_gatt_interface().BTA_GATTC_CancelOpen(0, bta_dm_discovery_cb.peer_bdaddr,

                                            true);



  bta_dm_discovery_set_state(BTA_DM_DISCOVER_IDLE);



  uint16_t conn_id = bta_dm_discovery_cb.conn_id;
@@ -659,38 +687,6 @@ static void bta_dm_service_discovery_cmpl() { 
  bta_dm_execute_queued_discovery_request();

}



/*******************************************************************************

 *

 * Function         bta_dm_disc_result

 *

 * Description      Service discovery result when discovering services on a

 *                  device

 *

 * Returns          void

 *

 ******************************************************************************/

static void bta_dm_disc_result(tBTA_DM_SVC_RES& disc_result) {

  log::verbose("");



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

   * bta_dm_gatt_disc_complete */

  bool is_gatt_over_ble = ((disc_result.device_type & BT_DEVICE_TYPE_BLE) != 0);



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

  if (!is_gatt_over_ble) {

    auto& r = disc_result;

    bta_dm_discovery_cb.service_search_cbacks.on_service_discovery_results(

        r.bd_addr, r.services, r.device_type, r.uuids, r.result, r.hci_status);

  } else {

    GAP_BleReadPeerPrefConnParams(bta_dm_discovery_cb.peer_bdaddr);

  }



  get_gatt_interface().BTA_GATTC_CancelOpen(0, bta_dm_discovery_cb.peer_bdaddr,

                                            true);



  bta_dm_service_discovery_cmpl();

}



/*******************************************************************************

 *

 * Function         bta_dm_free_sdp_db