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

Commit f369433f authored by William Leshner's avatar William Leshner Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ia642489d87e05b2cf9cb0e5aeba225ce915eba95
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 02fb6fc8 6cb72a51

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

+0 −7
Original line number Original line Diff line number Diff line
@@ -1051,13 +1051,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();