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

Commit 4e99f537 authored by Santos Cordon's avatar Santos Cordon Committed by Android (Google) Code Review
Browse files

Merge "Release display suspend blocker when shutting down DPC" into sc-dev

parents e65f5086 a778ee8b

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

+5 −6
Original line number Diff line number Diff line
@@ -874,6 +874,10 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
    private void cleanupHandlerThreadAfterStop() {

        setProximitySensorEnabled(false);

        mHandler.removeCallbacksAndMessages(null);

        if (mUnfinishedBusiness) {

            mCallbacks.releaseSuspendBlocker();

            mUnfinishedBusiness = false;

        }

        if (mPowerState != null) {

            mPowerState.stop();

            mPowerState = null;
@@ -1701,12 +1705,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
        }

    }



    private final Runnable mCleanListener = new Runnable() {

        @Override

        public void run() {

            sendUpdatePowerState();

        }

    };

    private final Runnable mCleanListener = this::sendUpdatePowerState;



    private void setProximitySensorEnabled(boolean enable) {

        if (enable) {