summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Vaibhav Devmurari <vdevmurari@google.com> 2024-12-09 13:15:03 +0000
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> 2024-12-12 04:11:43 -0800
commit25b34efb44bc1dbfc35dd37e0cddf3ae812b80bc (patch)
tree4125e8f2928a98367399b9d33bfaf539408e9ddb
parentb517b0f71196f98cbfedbf925cb3b78c0ab7f643 (diff)
Fix: Block opening settings app on keyguard without user auth
Test: atest KeyGestureEventTests Bug: 378900798 Flag: EXEMPT bugfix (cherry picked from commit d615298466085c4a88c6733804160e0c1ee7e31e) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e4d483a2ef99a71c6fcd6ad2e6c2f8f88ba380f4) Merged-In: I89d43872108710d20e0c4ef7e652d389896155d7 Change-Id: I89d43872108710d20e0c4ef7e652d389896155d7
-rw-r--r--services/core/java/com/android/server/policy/PhoneWindowManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 339428260800..60b0d7856ac9 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -3110,7 +3110,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
break;
case KeyEvent.KEYCODE_I:
- if (firstDown && event.isMetaPressed()) {
+ if (firstDown && event.isMetaPressed() && isUserSetupComplete() && !keyguardOn) {
showSystemSettings();
logKeyboardSystemsEvent(event, KeyboardLogEvent.LAUNCH_SYSTEM_SETTINGS);
return true;