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

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

Merge "Lock device on short power button press." into tm-qpr-dev am: 37929e00 am: bc77c0a8 

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



Change-Id: Iad1126ffab66abb9021d0ff435ee5c23824d38e9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 88ec0dba bc77c0a8

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

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

        }



        // Make sure the device locks. Unfortunately, this has the side-effect of briefly revealing

        // the lock screen before the dream appears. Note that this locking behavior needs to

        // happen regardless of whether we end up dreaming (below) or not.

        // TODO(b/261662912): Find a better way to lock the device that doesn't result in jank.

        lockNow(null);



        // 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();

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

            noDreamAction.run();