diff options
| author | 2024-08-27 23:39:12 +0000 | |
|---|---|---|
| committer | 2024-08-27 23:39:12 +0000 | |
| commit | 1d2e8a190b67c321bcc1fc7ec5299eca1d5e43cc (patch) | |
| tree | f1372a70cd62fa5ae1ff3c9acde38d657dce55e6 | |
| parent | e13e4f3155fee67e76f4c63473bf44526fb93a5a (diff) | |
| parent | 2c880275ff7a6f8ea87419da6fd8260dcfd22cc3 (diff) | |
Merge "Fix CtsOsTestCases.android.os.cts.PowerManager_ThermalTest#testGetThermalHeadroomThresholds errors" into main am: 2c880275ff
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3244081
Change-Id: Ic4346462c8fcaad2cb79e1142aca814b7381471f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/power/ThermalManagerService.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/power/ThermalManagerService.java b/services/core/java/com/android/server/power/ThermalManagerService.java index 7f2476979635..822ec2eb79b0 100644 --- a/services/core/java/com/android/server/power/ThermalManagerService.java +++ b/services/core/java/com/android/server/power/ThermalManagerService.java @@ -1644,8 +1644,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); |