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

Commit 3e4b763f authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Gerrit Code Review
Browse files

Merge "Fix initialization of procState counters after a failed readSummary" into main

parents 23e53c1c 5e3ce0ed

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) {