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

Commit e74e010d authored by Adam Bookatz's avatar Adam Bookatz Committed by Android (Google) Code Review
Browse files

Merge "Fix BatteryExternalStatsWorker UPDATE_ALL usage"

parents f446c02c 0d4205e6

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

+2 −2
Original line number Diff line number Diff line
@@ -353,7 +353,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) {
@@ -533,7 +533,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);

            }