diff options
| author | 2023-03-17 18:56:16 +0000 | |
|---|---|---|
| committer | 2023-03-17 18:56:16 +0000 | |
| commit | 45bbcae8e52bf4b066f677e74eaa7f61a11e6692 (patch) | |
| tree | 44530b9ea96dace26a577945a3cd024f2c43c4ac | |
| parent | 95fb7e89406b0a8a1d4da4f442183dfc9657bb1e (diff) | |
| parent | 0069ce22324630064d7614680d18e057483bbea8 (diff) | |
Merge "Lock BatteryStats when calling getStartClockTime" into tm-qpr-dev am: a908dde901 am: 0069ce2232
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22127534
Change-Id: If1f1bf072b513c9bb9559a7b24ec3f443c9da35d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/am/BatteryStatsService.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java index d09ca5cadfe7..7c84b7230816 100644 --- a/services/core/java/com/android/server/am/BatteryStatsService.java +++ b/services/core/java/com/android/server/am/BatteryStatsService.java @@ -843,7 +843,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) |