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

Commit c47de6b3 authored by Joel Galenson's avatar Joel Galenson Committed by android-build-merger
Browse files

Merge "Fix sensorservice on integer sanitized builds." am: 3aa6c982 

am: 74bf7329

Change-Id: Ie07e1465aa84f4d8256a6feafca9a4a2f17ad20e
parents d8f91eb3 74bf7329

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