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

Commit 45bbcae8 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Automerger Merge Worker
Browse files

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

Merge "Lock BatteryStats when calling getStartClockTime" into tm-qpr-dev am: a908dde9 am: 0069ce22

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



Change-Id: If1f1bf072b513c9bb9559a7b24ec3f443c9da35d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 95fb7e89 0069ce22

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

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