Merge "Fix initialization of procState counters after a failed readSummary" into main (324e5d6a) · Commits · e / os / android_frameworks_base

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

+13 −13

Original line number	Diff line number	Diff line
		@@ -8239,21 +8239,21 @@ 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.mCpuScalingPolicies.getScalingStepCount(),
		timestampMs);
		}
		if (mProcStateScreenOffTimeMs == null) {
		mProcStateScreenOffTimeMs =
		new TimeInFreqMultiStateCounter(mBsi.mOnBatteryScreenOffTimeBase,
		PROC_STATE_TIME_COUNTER_STATE_COUNT,
		mBsi.mCpuScalingPolicies.getScalingStepCount(),
		timestampMs);
		}
		}

		@GuardedBy("mBsi")
		private TimeInFreqMultiStateCounter getProcStateTimeCounter(long timestampMs) {