From 8a100c132ebd959c63d57aa1001298f0d8b779b1 Mon Sep 17 00:00:00 2001
From: Arthur Hung <arthurhung@google.com>
Date: Thu, 17 Mar 2022 14:57:22 +0800
Subject: [PATCH] Turn off the screen if no security lock

The lock or sleep power button behavior will lock the screen when the
screen is not in keyguard. It should turn off the screen directly if
there is no lock screen set.

Bug: 220814624
Test: manual
Change-Id: I94f7e5dbc15d16ec9e453a9b945d7fadb23ca004
---
 .../java/com/android/server/policy/PhoneWindowManager.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index dc5b325022a68..1ac373f074ecf 100644
--- 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*/);