From 2d0ff3d3bda22d5c5ba5a5412b8d5612affdb4dc Mon Sep 17 00:00:00 2001
From: Dmitri Plotnikov <dplotnikov@google.com>
Date: Mon, 8 Mar 2021 20:17:48 -0800
Subject: [PATCH] Prevent crash when power profile has incorrect freq counts

Bug: 179750543
Test: build and launch Settings
Change-Id: I9ede5caf0001deff0067eabd9520af9d315ac95f
---
 .../com/android/internal/os/SystemServicePowerCalculator.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/com/android/internal/os/SystemServicePowerCalculator.java b/core/java/com/android/internal/os/SystemServicePowerCalculator.java
index 5c0eeb2f54f97..b4d5f97a14e7c 100644
--- a/core/java/com/android/internal/os/SystemServicePowerCalculator.java
+++ b/core/java/com/android/internal/os/SystemServicePowerCalculator.java
@@ -134,7 +134,8 @@ public class SystemServicePowerCalculator extends PowerCalculator {
         // TODO(179210707): additionally account for CPU active and per cluster battery use
 
         double powerMah = 0;
-        for (int i = 0; i < mPowerEstimators.length; i++) {
+        final int size = Math.min(mPowerEstimators.length, systemServiceTimeAtCpuSpeeds.length);
+        for (int i = 0; i < size; i++) {
             powerMah += mPowerEstimators[i].calculatePower(systemServiceTimeAtCpuSpeeds[i]);
         }