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

2022-03-21 01:30:39 +00:00
parent 48b334a442 8a100c132e
commit 69785934a4
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -1023,7 +1023,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
                    break;
                }
                case SHORT_PRESS_POWER_LOCK_OR_SLEEP: {
-                    if (keyguardOn()) {
+                    if (mKeyguardDelegate == null || !mKeyguardDelegate.hasKeyguard()
+                            || !mKeyguardDelegate.isSecure(mCurrentUserId) || keyguardOn()) {
                        sleepDefaultDisplayFromPowerButton(eventTime, 0);
                    } else {
                        lockNow(null /*options*/);