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

Commit 33e1d946 authored by Chris Manton's avatar Chris Manton
Browse files

User proper type btif_dm::num_eir_uuids int=>size_t 

Bug: 188297862
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I4b2b292d597a92171b97a3028d3e9ab24ffb3f70
parent 91e76d3c

system/btif/src/btif_dm.cc

+3 −3
Original line number Original line 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.

      /* onUuidChanged requires getBondedDevices to be populated.

      ** bond_state_changed needs to be sent prior to remote_device_property

      ** 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 = {};

      Uuid uuid = {};

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

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

          (p_data->disc_res.bd_addr == pairing_cb.bd_addr ||

          (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) {

            p_data->disc_res.num_uuids == 0) {

          auto uuids_iter = eir_uuids_cache.find(bd_addr);

          auto uuids_iter = eir_uuids_cache.find(bd_addr);

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

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

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

            num_eir_uuids = uuids_iter->second.size();

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

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

                     num_eir_uuids, ADDRESS_TO_LOGGABLE_CSTR(bd_addr));

                     num_eir_uuids, ADDRESS_TO_LOGGABLE_CSTR(bd_addr));

            for (auto eir_uuid : uuids_iter->second) {

            for (auto eir_uuid : uuids_iter->second) {

              auto uuid_128bit = eir_uuid.To128BitBE();

              auto uuid_128bit = eir_uuid.To128BitBE();