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

Merge "Lock BatteryStats when calling getStartClockTime" into tm-qpr-dev

Browse Source
This commit is contained in:
Dmitri Plotnikov
2023-03-17 18:03:45 +00:00
committed by Android (Google) Code Review
parent 198f6aac33 866906591f
commit a908dde901
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/am/BatteryStatsService.java
View File

@@ -822,7 +822,10 @@ public final class BatteryStatsService extends IBatteryStats.Stub
final long sessionStart = mBatteryUsageStatsStore final long sessionStart = mBatteryUsageStatsStore
.getLastBatteryUsageStatsBeforeResetAtomPullTimestamp(); .getLastBatteryUsageStatsBeforeResetAtomPullTimestamp();
final long sessionEnd = mStats.getStartClockTime(); final long sessionEnd;
synchronized (mStats) {
sessionEnd = mStats.getStartClockTime();
}
final BatteryUsageStatsQuery queryBeforeReset = final BatteryUsageStatsQuery queryBeforeReset =
new BatteryUsageStatsQuery.Builder() new BatteryUsageStatsQuery.Builder()
.setMaxStatsAgeMs(0) .setMaxStatsAgeMs(0)