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

Commit 807d43ab authored by Christian Hoffmann's avatar Christian Hoffmann Committed by Jan Altensen
Browse files

Set callback before hal connection to avoid NPE on startup 

Change-Id: I3b61ba8485600783e4afb2d73549967783b137cd
parent 82eb8ec5

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

+3 −1
Original line number Diff line number Diff line
@@ -139,17 +139,19 @@ public class ThermalManagerService extends SystemService { 
            boolean halConnected = (mHalWrapper != null);

            if (!halConnected) {

                mHalWrapper = new ThermalHal20Wrapper();

                mHalWrapper.setCallback(this::onTemperatureChangedCallback);

                halConnected = mHalWrapper.connectToHal();

            }

            if (!halConnected) {

                mHalWrapper = new ThermalHal11Wrapper();

                mHalWrapper.setCallback(this::onTemperatureChangedCallback);

                halConnected = mHalWrapper.connectToHal();

            }

            if (!halConnected) {

                mHalWrapper = new ThermalHal10Wrapper();

                mHalWrapper.setCallback(this::onTemperatureChangedCallback);

                halConnected = mHalWrapper.connectToHal();

            }

            mHalWrapper.setCallback(this::onTemperatureChangedCallback);

            if (!halConnected) {

                Slog.w(TAG, "No Thermal HAL service on this device");

                return;