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

Commit 0d4205e6 authored by Adam Bookatz's avatar Adam Bookatz
Browse files

Fix BatteryExternalStatsWorker UPDATE_ALL usage 

In some places, BESW compares the update flag against UPDATE_ALL
in a way that will always be true, instead of seeing if it is
actually equal to it.

This would have led to far more frequent updateKernelWakelocksLocked
and updateKernelMemoryBandwidthLocked calls than intended.

Test: n/a
Bug: 174818202
Change-Id: I19a5cf80eee0768989dcea0c2f205dc9f749ac9f
parent 1086c93f

services/core/java/com/android/server/am/BatteryExternalStatsWorker.java

+2 −2
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ class BatteryExternalStatsWorker implements BatteryStatsImpl.ExternalStatsSync { 
                mUidsToRemove.clear();

                mCurrentFuture = null;

                mUseLatestStates = true;

                if ((updateFlags & UPDATE_ALL) != 0) {

                if (updateFlags == UPDATE_ALL) {

                    cancelSyncDueToBatteryLevelChangeLocked();

                }

                if ((updateFlags & UPDATE_CPU) != 0) {
@@ -517,7 +517,7 @@ class BatteryExternalStatsWorker implements BatteryStatsImpl.ExternalStatsSync { 
                mStats.updateCpuTimeLocked(onBattery, onBatteryScreenOff);

            }



            if ((updateFlags & UPDATE_ALL) != 0) {

            if (updateFlags == UPDATE_ALL) {

                mStats.updateKernelWakelocksLocked(elapsedRealtimeUs);

                mStats.updateKernelMemoryBandwidthLocked(elapsedRealtimeUs);

            }