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

Commit 5562d804 authored by Yuncheol Heo's avatar Yuncheol Heo
Browse files

Fix NPE in DisplayPowerController. 

Bug: 181365021
Test: atest com.android.car.CarUxRestrictionsManagerServiceTest
Change-Id: Ic704edf0f43cf05b0fc73124497086b2594eaabd
parent b3372164

services/core/java/com/android/server/display/DisplayPowerController.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -877,9 +877,11 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
    private void cleanupHandlerThreadAfterStop() {

    private void cleanupHandlerThreadAfterStop() {

        setProximitySensorEnabled(false);

        setProximitySensorEnabled(false);

        mHandler.removeCallbacksAndMessages(null);

        mHandler.removeCallbacksAndMessages(null);

        if (mPowerState != null) {

            mPowerState.stop();

            mPowerState.stop();

            mPowerState = null;

            mPowerState = null;

        }

        }

    }





    private void updatePowerState() {

    private void updatePowerState() {

        // Update the power state request.

        // Update the power state request.