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

Commit 0df1a3cc authored by Yuncheol Heo's avatar Yuncheol Heo Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE in DisplayPowerController." into sc-dev am: 0c1a6ec3 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a2cc48147cedb57667bf42a8dbc78af1c6ccb2d
parents b9f12705 0c1a6ec3

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

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

        setProximitySensorEnabled(false);

        mHandler.removeCallbacksAndMessages(null);

        if (mPowerState != null) {

            mPowerState.stop();

            mPowerState = null;

        }

    }



    private void updatePowerState() {

        // Update the power state request.