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

Commit 2c880275 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix... 

Merge "Fix CtsOsTestCases.android.os.cts.PowerManager_ThermalTest#testGetThermalHeadroomThresholds errors" into main
parents 03c977c2 b5aebd01

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

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

                            for (int severity = ThrottlingSeverity.LIGHT;

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

                                if (severity != ThrottlingSeverity.SEVERE

                                        && threshold.hotThrottlingThresholds.length > severity) {

                                if (threshold.hotThrottlingThresholds.length > severity) {

                                    updateHeadroomThreshold(severity,

                                            threshold.hotThrottlingThresholds[severity],

                                            severeThreshold);