Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0874802a authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Automerger Merge Worker
Browse files

Merge "Prevent crash when power profile has incorrect freq counts" into sc-dev am: f0a75544 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13811169

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib1c8c0a6325cf31406655bbaded19fb0544e4051
parents 346268b7 f0a75544

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

+2 −1
Original line number Diff line number Diff line
@@ -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]);

        }