Merge "Fix CPU power bracket initialization when /proc/uid_time_in_state file is unsupported"

1 files changed, 4 insertions, 1 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 6e931717c1dd..77fb360ffb85 100644
--- a/services/core/java/com/android/server/power/stats/BatteryStatsImpl.java
+++ b/services/core/java/com/android/server/power/stats/BatteryStatsImpl.java
@@ -10818,6 +10818,8 @@ public class BatteryStatsImpl extends BatteryStats {
     public void setPowerProfileLocked(PowerProfile profile) {
         mPowerProfile = profile;
 
+        int totalSpeedStepCount = 0;
+
         // We need to initialize the KernelCpuSpeedReaders to read from
         // the first cpu of each core. Once we have the PowerProfile, we have access to this
         // information.
@@ -10829,11 +10831,12 @@ public class BatteryStatsImpl extends BatteryStats {
             mKernelCpuSpeedReaders[i] = new KernelCpuSpeedReader(firstCpuOfCluster,
                     numSpeedSteps);
             firstCpuOfCluster += mPowerProfile.getNumCoresInCpuCluster(i);
+            totalSpeedStepCount += numSpeedSteps;
         }
 
         // Initialize CPU power bracket map, which combines CPU states (cluster/freq pairs)
         // into a small number of brackets
-        mCpuPowerBracketMap = new int[getCpuFreqCount()];
+        mCpuPowerBracketMap = new int[totalSpeedStepCount];
         int index = 0;
         int numCpuClusters = mPowerProfile.getNumCpuClusters();
         for (int cluster = 0; cluster < numCpuClusters; cluster++) {