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

Commit 09e97df4 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

User proper type btif_dm::num_eir_uuids int=>size_t am: 33e1d946 

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



Change-Id: I5e6dfc88719dc817f16da45e7d868eaf93eaefd9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 859d968b 33e1d946

system/btif/src/btif_dm.cc

+3 −3
Original line number Diff line number Diff line
@@ -1496,7 +1496,7 @@ static void btif_dm_search_services_evt(tBTA_DM_SEARCH_EVT event, 
      /* onUuidChanged requires getBondedDevices to be populated.

      ** bond_state_changed needs to be sent prior to remote_device_property

      */

      auto num_eir_uuids = 0;

      size_t num_eir_uuids = 0U;

      Uuid uuid = {};

      if (pairing_cb.state == BT_BOND_STATE_BONDED && pairing_cb.sdp_attempts &&

          (p_data->disc_res.bd_addr == pairing_cb.bd_addr ||
@@ -1510,8 +1510,8 @@ static void btif_dm_search_services_evt(tBTA_DM_SEARCH_EVT event, 
            p_data->disc_res.num_uuids == 0) {

          auto uuids_iter = eir_uuids_cache.find(bd_addr);

          if (uuids_iter != eir_uuids_cache.end()) {

            num_eir_uuids = static_cast<int>(uuids_iter->second.size());

            LOG_INFO("SDP failed, send %d EIR UUIDs to unblock bonding %s",

            num_eir_uuids = uuids_iter->second.size();

            LOG_INFO("SDP failed, send %zu EIR UUIDs to unblock bonding %s",

                     num_eir_uuids, ADDRESS_TO_LOGGABLE_CSTR(bd_addr));

            for (auto eir_uuid : uuids_iter->second) {

              auto uuid_128bit = eir_uuid.To128BitBE();