diff options
| author | 2024-09-12 20:35:35 +0000 | |
|---|---|---|
| committer | 2024-09-12 20:35:35 +0000 | |
| commit | 08581bce863c53b3512b217593be6a9e9db2bc4c (patch) | |
| tree | b5ff5fe0d7e8f63c3a584b93ecb9b161d0564d2d | |
| parent | 5aec5b674ead6ef9d1568026726e633688386204 (diff) | |
| parent | 9946c9502f70ae6ebe25408206415e5daf9ab837 (diff) | |
Merge "ThermalManager: Don't hold mSamples lock while calling power HAL" into main am: 9946c9502f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3261431
Change-Id: Ic57c8a42c152f8a5450274fe99eb181ac1bb9d53
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 | 4 |
1 files changed, 2 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 6847a5c699ac..dc6b1644db4d 100644 --- a/services/core/java/com/android/server/power/ThermalManagerService.java +++ b/services/core/java/com/android/server/power/ThermalManagerService.java @@ -1628,9 +1628,9 @@ public class ThermalManagerService extends SystemService { long mInactivityThresholdMillis = INACTIVITY_THRESHOLD_MILLIS; void updateThresholds() { - synchronized (mSamples) { - List<TemperatureThreshold> thresholds = + List<TemperatureThreshold> thresholds = mHalWrapper.getTemperatureThresholds(true, Temperature.TYPE_SKIN); + synchronized (mSamples) { if (Flags.allowThermalHeadroomThresholds()) { Arrays.fill(mHeadroomThresholds, Float.NaN); } |