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

Lock BatteryStats when calling getStartClockTime

Browse Source 
Bug: 259246845
Test: atest android.cts.statsdatom.batterystats.BatteryUsageStatsTests#testBatteryUsageStatsSinceReset
Change-Id: I2849028b13f8eeadd8f732b5ff7847a1bf641f21
This commit is contained in:
Dmitri Plotnikov
2023-03-16 14:50:54 -07:00
parent bb208e4159
commit 866906591f
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
.getLastBatteryUsageStatsBeforeResetAtomPullTimestamp();
final long sessionEnd = mStats.getStartClockTime();
final long sessionEnd;
synchronized (mStats) {
sessionEnd = mStats.getStartClockTime();
}
final BatteryUsageStatsQuery queryBeforeReset =
new BatteryUsageStatsQuery.Builder()
.setMaxStatsAgeMs(0)