commit 9946c9502f70ae6ebe25408206415e5daf9ab837
author Xiang Wang <xwxw@google.com> Thu Sep 12 20:05:58 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 12 20:05:58 2024 +0000
tree dd6fdb80296b0421348bb40abe29b7f9a6abd651
parent 277e5df4c699aaa9ee2ed505ea83a41cb2068e01
parent 2af2a8c35619557d206c0616a21e12470854f1a5

Merge "ThermalManager: Don't hold mSamples lock while calling power HAL" into main

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

diff --git a/services/core/java/com/android/server/power/ThermalManagerService.java b/services/core/java/com/android/server/power/ThermalManagerService.java
index 6847a5c..dc6b164 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 @@
         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);
                 }