Merge "thermal: Fix throttle/release step bypass issue" into tm-qpr-devandroid-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-release

1 files changed, 2 insertions, 2 deletions

diff --git a/thermal/utils/thermal_throttling.cpp b/thermal/utils/thermal_throttling.cpp
index 0a5f926b..b2fd9d26 100644
--- a/thermal/utils/thermal_throttling.cpp
+++ b/thermal/utils/thermal_throttling.cpp
@@ -427,7 +427,7 @@ bool ThermalThrottling::allocatePowerToCdev(
 
                 if (binded_cdev_info_pair.second.max_release_step !=
                             std::numeric_limits<int>::max() &&
-                    cdev_power_adjustment > 0) {
+                    (power_data_invalid || cdev_power_adjustment > 0)) {
                     auto target_state =
                             std::max(curr_state - binded_cdev_info_pair.second.max_release_step, 0);
                     cdev_power_budget =
@@ -436,7 +436,7 @@ bool ThermalThrottling::allocatePowerToCdev(
 
                 if (binded_cdev_info_pair.second.max_throttle_step !=
                             std::numeric_limits<int>::max() &&
-                    cdev_power_adjustment < 0) {
+                    (power_data_invalid || cdev_power_adjustment < 0)) {
                     auto target_state =
                             std::min(curr_state + binded_cdev_info_pair.second.max_throttle_step,
                                      cdev_info.max_state);