commit 93a867ffd28ddc47a4ec70b99a9b86e0ea63e8ea
author Adam Lesinski <adamlesinski@google.com> Mon Sep 21 16:54:52 2015 -0700
committer The Android Automerger <android-build@google.com> Tue Sep 22 13:51:41 2015 -0700
tree e33ef6808f29141d17f62b3cd41026a35c849ac6
parent c99b3935ed0673181def870ccbfb84878520013b

Fix Array Index Out of Bounds in BatteryStatsImpl

If the power profile was not set yet, the default sizes of
cpu freq arrays could have been too small.

Bug:24244089
Change-Id: Ic17a1e8f2058c51fbdda14db35b7b62f4880be00

core/java/com/android/internal/os/BatteryStatsImpl.java

diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index 6ccdd08..e39bf607 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -8044,6 +8044,10 @@
      * wakelocks. If the screen is on, we just assign the actual cpu time an app used.
      */
     public void updateCpuTimeLocked() {
+        if (mPowerProfile == null) {
+            return;
+        }
+
         if (DEBUG_ENERGY_CPU) {
             Slog.d(TAG, "!Cpu updating!");
         }
@@ -8131,14 +8135,19 @@
 
                         // Add the cpu speeds to this UID. These are used as a ratio
                         // for computing the power this UID used.
-                        if (u.mCpuClusterSpeed == null) {
-                            u.mCpuClusterSpeed = new LongSamplingCounter[clusterSpeeds.length][];
+                        final int numClusters = mPowerProfile.getNumCpuClusters();
+                        if (u.mCpuClusterSpeed == null || u.mCpuClusterSpeed.length !=
+                                numClusters) {
+                            u.mCpuClusterSpeed = new LongSamplingCounter[numClusters][];
                         }
 
                         for (int cluster = 0; cluster < clusterSpeeds.length; cluster++) {
-                            if (u.mCpuClusterSpeed[cluster] == null) {
+                            final int speedsInCluster = mPowerProfile.getNumSpeedStepsInCpuCluster(
+                                    cluster);
+                            if (u.mCpuClusterSpeed[cluster] == null || speedsInCluster !=
+                                    u.mCpuClusterSpeed[cluster].length) {
                                 u.mCpuClusterSpeed[cluster] =
-                                        new LongSamplingCounter[clusterSpeeds[cluster].length];
+                                        new LongSamplingCounter[speedsInCluster];
                             }
 
                             final LongSamplingCounter[] cpuSpeeds = u.mCpuClusterSpeed[cluster];