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

Commit d84495f8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix... 

Merge "Fix CtsOsTestCases.android.os.cts.PowerManager_ThermalTest#testGetThermalHeadroomThresholds errors" into main am: 2c880275 am: 1d2e8a19

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



Change-Id: I98bb3ab166b289641622800968652f9746ec2e7e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cdda826a 1d2e8a19

services/core/java/com/android/server/power/ThermalManagerService.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -1644,8 +1644,7 @@ public class ThermalManagerService extends SystemService { 
                        if (Flags.allowThermalHeadroomThresholds()) {

                        if (Flags.allowThermalHeadroomThresholds()) {

                            for (int severity = ThrottlingSeverity.LIGHT;

                            for (int severity = ThrottlingSeverity.LIGHT;

                                    severity <= ThrottlingSeverity.SHUTDOWN; severity++) {

                                    severity <= ThrottlingSeverity.SHUTDOWN; severity++) {

                                if (severity != ThrottlingSeverity.SEVERE

                                if (threshold.hotThrottlingThresholds.length > severity) {

                                        && threshold.hotThrottlingThresholds.length > severity) {

                                    updateHeadroomThreshold(severity,

                                    updateHeadroomThreshold(severity,

                                            threshold.hotThrottlingThresholds[severity],

                                            threshold.hotThrottlingThresholds[severity],

                                            severeThreshold);

                                            severeThreshold);