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

Commit de7694af authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "btif::dm::btif_on_gatt_results Clarify btif is_le usage" into main am:... 

Merge "btif::dm::btif_on_gatt_results Clarify btif is_le usage" into main am: 5312ce77 am: f080bfe7

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



Change-Id: Id012811582ae678990bffdf95d0187e28d29bcd0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 91ea9a1d f080bfe7

system/btif/src/btif_dm.cc

+4 −4
Original line number Original line Diff line number Diff line
@@ -1714,14 +1714,14 @@ static void btif_on_service_discovery_results(RawAddress bd_addr, 
}

}





void btif_on_gatt_results(RawAddress bd_addr, BD_NAME bd_name,

void btif_on_gatt_results(RawAddress bd_addr, BD_NAME bd_name,

                          std::vector<bluetooth::Uuid>& services, bool transport_le) {

                          std::vector<bluetooth::Uuid>& services, bool is_transport_le) {

  std::vector<bt_property_t> prop;

  std::vector<bt_property_t> prop;

  std::vector<uint8_t> property_value;

  std::vector<uint8_t> property_value;

  std::set<Uuid> uuids;

  std::set<Uuid> uuids;

  RawAddress static_addr_copy = pairing_cb.static_bdaddr;

  RawAddress static_addr_copy = pairing_cb.static_bdaddr;

  bool lea_supported = is_le_audio_capable_during_service_discovery(bd_addr);

  bool lea_supported = is_le_audio_capable_during_service_discovery(bd_addr);





  if (transport_le) {

  if (is_transport_le) {

    log::info("New GATT over LE UUIDs for {}:", bd_addr);

    log::info("New GATT over LE UUIDs for {}:", bd_addr);

    BTM_LogHistory(kBtmLogTag, bd_addr, "Discovered GATT services using LE transport");

    BTM_LogHistory(kBtmLogTag, bd_addr, "Discovered GATT services using LE transport");

    if (btif_is_gatt_service_discovery_post_pairing(bd_addr)) {

    if (btif_is_gatt_service_discovery_post_pairing(bd_addr)) {
@@ -1769,7 +1769,7 @@ void btif_on_gatt_results(RawAddress bd_addr, BD_NAME bd_name, 
     * immediately send them with rest of SDP results in

     * immediately send them with rest of SDP results in

     * on_service_discovery_results

     * on_service_discovery_results

     */

     */

    if (!transport_le) {

    if (!is_transport_le) {

      return;

      return;

    }

    }
@@ -1835,7 +1835,7 @@ void btif_on_gatt_results(RawAddress bd_addr, BD_NAME bd_name, 
    ASSERTC(ret == BT_STATUS_SUCCESS, "failed to save remote device property", ret);

    ASSERTC(ret == BT_STATUS_SUCCESS, "failed to save remote device property", ret);

  }

  }





  if (!transport_le) {

  if (!is_transport_le) {

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

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

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

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

    return;

    return;