commit c47de6b371041ef7ae6edf7338900cf1abcd3b66
author Joel Galenson <jgalenson@google.com> Thu Jan 04 00:00:42 2018 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 04 00:00:42 2018 +0000
tree c77215bf489463185a8090a8737e165227b9a307
parent d8f91eb357151aaf5d8170e7c6ac0ee3b8d6b830
parent 74bf7329c742e8a84633337b9c3313acb348ecf5

Merge "Fix sensorservice on integer sanitized builds." am: 3aa6c9820b
am: 74bf7329c7

Change-Id: Ie07e1465aa84f4d8256a6feafca9a4a2f17ad20e

services/sensorservice/BatteryService.cpp

diff --git a/services/sensorservice/BatteryService.cpp b/services/sensorservice/BatteryService.cpp
index 452c8c6..330861d 100644
--- a/services/sensorservice/BatteryService.cpp
+++ b/services/sensorservice/BatteryService.cpp
@@ -78,12 +78,13 @@
     if (checkService()) {
         Mutex::Autolock _l(mActivationsLock);
         int64_t identity = IPCThreadState::self()->clearCallingIdentity();
-        for (size_t i=0 ; i<mActivations.size() ; i++) {
+        for (size_t i=0 ; i<mActivations.size() ; ) {
             const Info& info(mActivations[i]);
             if (info.uid == uid) {
                 mBatteryStatService->noteStopSensor(info.uid, info.handle);
                 mActivations.removeAt(i);
-                i--;
+            } else {
+              i++;
             }
         }
         IPCThreadState::self()->restoreCallingIdentity(identity);
@@ -105,4 +106,3 @@
 
 // ---------------------------------------------------------------------------
 }; // namespace android
-