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

Commit 5948d407 authored by Xiang Wang's avatar Xiang Wang Committed by Automerger Merge Worker
Browse files

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

Merge "ThermalManager: Don't hold mSamples lock while calling power HAL" into main am: 9946c950 am: 08581bce

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3261431



Change-Id: I00e10faadf9707b72eb81a66f3e3282a32a2f741
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f8338ad2 08581bce

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

+2 −2
Original line number Diff line number Diff line
@@ -1628,9 +1628,9 @@ public class ThermalManagerService extends SystemService { 
        long mInactivityThresholdMillis = INACTIVITY_THRESHOLD_MILLIS;



        void updateThresholds() {

            synchronized (mSamples) {

            List<TemperatureThreshold> thresholds =

                        mHalWrapper.getTemperatureThresholds(true, Temperature.TYPE_SKIN);

            synchronized (mSamples) {

                if (Flags.allowThermalHeadroomThresholds()) {

                    Arrays.fill(mHeadroomThresholds, Float.NaN);

                }