diff options
| author | 2023-11-28 00:51:26 +0000 | |
|---|---|---|
| committer | 2023-11-28 00:51:26 +0000 | |
| commit | 3e4b763f4e868525c7876d19389a79a79c0aaa2c (patch) | |
| tree | 035250f9715de5dda899b4250c49505ca8cd2c81 | |
| parent | 23e53c1c7e035240c76c1196a0ebf1e2ed153356 (diff) | |
| parent | 5e3ce0ed00450e92aaf3134e896252777ab67ad8 (diff) | |
Merge "Fix initialization of procState counters after a failed readSummary" into main
| -rw-r--r-- | services/core/java/com/android/server/power/stats/BatteryStatsImpl.java | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/services/core/java/com/android/server/power/stats/BatteryStatsImpl.java b/services/core/java/com/android/server/power/stats/BatteryStatsImpl.java index 27329e20bc8d..5dff9ef5076e 100644 --- a/services/core/java/com/android/server/power/stats/BatteryStatsImpl.java +++ b/services/core/java/com/android/server/power/stats/BatteryStatsImpl.java @@ -8203,18 +8203,18 @@ 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); } - - mProcStateTimeMs = - new TimeInFreqMultiStateCounter(mBsi.mOnBatteryTimeBase, - PROC_STATE_TIME_COUNTER_STATE_COUNT, mBsi.getCpuFreqCount(), - timestampMs); - mProcStateScreenOffTimeMs = - new TimeInFreqMultiStateCounter(mBsi.mOnBatteryScreenOffTimeBase, - PROC_STATE_TIME_COUNTER_STATE_COUNT, mBsi.getCpuFreqCount(), - timestampMs); } @GuardedBy("mBsi") |