Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86690659 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov
Browse files

Lock BatteryStats when calling getStartClockTime 

Bug: 259246845
Test: atest android.cts.statsdatom.batterystats.BatteryUsageStatsTests#testBatteryUsageStatsSinceReset
Change-Id: I2849028b13f8eeadd8f732b5ff7847a1bf641f21
parent bb208e41

services/core/java/com/android/server/am/BatteryStatsService.java

+4 −1
Original line number Diff line number Diff line
@@ -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)