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

Commit 0e3555ea authored by Oleg Blinnikov's avatar Oleg Blinnikov Committed by Android (Google) Code Review
Browse files

Merge "Drop unblockScreenOff" into main

parents e70b2c2b b427af81

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

+0 −1
Original line number Diff line number Diff line
@@ -2235,7 +2235,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                    setReportedScreenState(REPORTED_TO_POLICY_SCREEN_TURNING_OFF);

                    blockScreenOff();

                    mWindowManagerPolicy.screenTurningOff(mDisplayId, mPendingScreenOffUnblocker);

                    unblockScreenOff();

                } else if (mPendingScreenOffUnblocker != null) {

                    // Abort doing the state change until screen off is unblocked.

                    return false;