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

Commit 6cb72a51 authored by William Leshner's avatar William Leshner Committed by Android (Google) Code Review
Browse files

Merge "Remove a hack to fix a short power button press behavior." into tm-qpr-dev

parents e1990007 bedbfd31

services/core/java/com/android/server/policy/PhoneWindowManager.java

+0 −7
Original line number Original line Diff line number Diff line
@@ -1049,13 +1049,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            return;

            return;

        }

        }





        // Don't dream if the user isn't user zero.

        // TODO(b/261907079): Move this check to DreamManagerService#canStartDreamingInternal().

        if (ActivityManager.getCurrentUser() != UserHandle.USER_SYSTEM) {

            noDreamAction.run();

            return;

        }



        final DreamManagerInternal dreamManagerInternal = getDreamManagerInternal();

        final DreamManagerInternal dreamManagerInternal = getDreamManagerInternal();

        if (dreamManagerInternal == null || !dreamManagerInternal.canStartDreaming(isScreenOn)) {

        if (dreamManagerInternal == null || !dreamManagerInternal.canStartDreaming(isScreenOn)) {

            noDreamAction.run();

            noDreamAction.run();