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

Commit 393450ca authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Automerger Merge Worker
Browse files

Merge "Fix initialization of procState counters after a failed readSummary"... 

Merge "Fix initialization of procState counters after a failed readSummary" into main am: 3e4b763f am: 6ae5c917

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



Change-Id: I4dbdaeae29572d386881d71d8f865f43705d17b5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 99441521 6ae5c917

services/core/java/com/android/server/power/stats/BatteryStatsImpl.java

+11 −11
Original line number Diff line number Diff line
@@ -8203,19 +8203,19 @@ public class BatteryStatsImpl extends BatteryStats { 














        @GuardedBy("mBsi")















        private void ensureMultiStateCounters(long timestampMs) {













            if (mProcStateTimeMs != null) {













                return;













            }

























            if (mProcStateTimeMs == null) {















                mProcStateTimeMs =















                        new TimeInFreqMultiStateCounter(mBsi.mOnBatteryTimeBase,















                                PROC_STATE_TIME_COUNTER_STATE_COUNT, mBsi.getCpuFreqCount(),















                                timestampMs);













            }













            if (mProcStateScreenOffTimeMs == null) {















                mProcStateScreenOffTimeMs =















                        new TimeInFreqMultiStateCounter(mBsi.mOnBatteryScreenOffTimeBase,















                                PROC_STATE_TIME_COUNTER_STATE_COUNT, mBsi.getCpuFreqCount(),















                                timestampMs);















            }













        }





























        @GuardedBy("mBsi")















        private TimeInFreqMultiStateCounter getProcStateTimeCounter(long timestampMs) {