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

2023-03-17 18:03:45 +00:00
parent 198f6aac33 866906591f
commit a908dde901
1 changed files with 4 additions and 1 deletions
--- a/services/core/java/com/android/server/am/BatteryStatsService.java
+++ b/services/core/java/com/android/server/am/BatteryStatsService.java
@@ -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)