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

Commit 3aa6c982 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix sensorservice on integer sanitized builds."

parents 6f1f7b98 7aafa16f

services/sensorservice/BatteryService.cpp

+3 −3
Original line number Diff line number Diff line
@@ -78,12 +78,13 @@ void BatteryService::cleanupImpl(uid_t uid) { 
    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 @@ ANDROID_SINGLETON_STATIC_INSTANCE(BatteryService) 


// ---------------------------------------------------------------------------

}; // namespace android