Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix BatteryExternalStatsWorker UPDATE_ALL usage

Browse Source 
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
This commit is contained in:
Adam Bookatz
2020-12-03 23:52:02 -08:00
parent 1086c93f77
commit 0d4205e6aa
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/am/BatteryExternalStatsWorker.java
View File

@@ -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);
}