commit 80af5920652d093d36fd70d4d4545b9eb7bf5587
author Victor Berchet <berchet@google.com> Wed Feb 23 16:01:10 2022 -0800
committer Victor Berchet <berchet@google.com> Thu Feb 24 16:43:35 2022 +0000
tree 19216b64b6bf033197c6296bc4c82a7613658ae6
parent cc28fabef428084412d34c9ef6ae376a70dccfdf

Fix shorten-64-to-32 errors

Bug: 144189870

Test: run_sim.sh shows no compilation errors

Change-Id: I6843db9f310284f2e0b9d508d8586647409ea161

core/audio_request_manager.cc

diff --git a/core/audio_request_manager.cc b/core/audio_request_manager.cc
index 98821cd..3c0790e 100644
--- a/core/audio_request_manager.cc
+++ b/core/audio_request_manager.cc
@@ -275,7 +275,8 @@
 uint32_t AudioRequestManager::disableAllAudioRequests(const Nanoapp *nanoapp) {
   uint32_t numRequestDisabled = 0;
 
-  for (size_t handle = 0; handle < mAudioRequestLists.size(); ++handle) {
+  const uint32_t numRequests = static_cast<uint32_t>(mAudioRequestLists.size());
+  for (uint32_t handle = 0; handle < numRequests; ++handle) {
     AudioRequest *audioRequest = findAudioRequestByInstanceId(
         handle, nanoapp->getInstanceId(), nullptr /*index*/, nullptr
         /*instanceIdIndex*/);

core/sensor_request_manager.cc

diff --git a/core/sensor_request_manager.cc b/core/sensor_request_manager.cc
index 0ba0722..e87442f 100644
--- a/core/sensor_request_manager.cc
+++ b/core/sensor_request_manager.cc
@@ -599,7 +599,8 @@
 uint32_t SensorRequestManager::disableAllSubscriptions(Nanoapp *nanoapp) {
   uint32_t numDisabledSubscriptions = 0;
 
-  for (size_t handle = 0; handle < mSensors.size(); handle++) {
+  const uint32_t numSensors = static_cast<uint32_t>(mSensors.size());
+  for (uint32_t handle = 0; handle < numSensors; handle++) {
     Sensor &sensor = mSensors[handle];
     bool nanoappHasRequest =
         sensor.getRequestMultiplexer().findRequest(