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 am: a908dde901

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22127534

Change-Id: Iea787b37841a94cbf2b3b668e8d294a7aa66931e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Dmitri Plotnikov
2023-03-17 18:11:05 +00:00
committed by Automerger Merge Worker
parent 2f5b89b244 a908dde901
commit 0069ce2232
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

@@ -827,7 +827,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)