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

Commit 8bf686eb authored by Arthur Hung's avatar Arthur Hung Committed by Automerger Merge Worker
Browse files

Merge "Turn off the screen if no security lock" into tm-dev am: 69785934 

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

Change-Id: I11ae76cbb060541f81a0723eaf3af890a42b33af
parents f89806f3 69785934

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -1023,7 +1023,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    break;

                    break;

                }

                }

                case SHORT_PRESS_POWER_LOCK_OR_SLEEP: {

                case SHORT_PRESS_POWER_LOCK_OR_SLEEP: {

                    if (keyguardOn()) {

                    if (mKeyguardDelegate == null || !mKeyguardDelegate.hasKeyguard()

                            || !mKeyguardDelegate.isSecure(mCurrentUserId) || keyguardOn()) {

                        sleepDefaultDisplayFromPowerButton(eventTime, 0);

                        sleepDefaultDisplayFromPowerButton(eventTime, 0);

                    } else {

                    } else {

                        lockNow(null /*options*/);

                        lockNow(null /*options*/);