commit 7ad2c69032a7f2f68f3eacd964a18ac90aca6b06
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Nov 20 15:27:35 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 20 15:27:35 2023 +0000
tree e2860b7edcb4f7904238b1a669d4632de525b6d6
parent d7a733fddddcd8c27017f5e8634d5b517879ad83
parent a337c5f813a906b38c3e585aedccb3c31bcc3157

Merge "Tolerate "--dismiss-keyguard"" into main

services/core/java/com/android/server/am/ActivityManagerShellCommand.java

diff --git a/services/core/java/com/android/server/am/ActivityManagerShellCommand.java b/services/core/java/com/android/server/am/ActivityManagerShellCommand.java
index 9d8f979..f3b2ef3 100644
--- a/services/core/java/com/android/server/am/ActivityManagerShellCommand.java
+++ b/services/core/java/com/android/server/am/ActivityManagerShellCommand.java
@@ -552,7 +552,8 @@
                     mAsync = true;
                 } else if (opt.equals("--splashscreen-show-icon")) {
                     mShowSplashScreen = true;
-                } else if (opt.equals("--dismiss-keyguard-if-insecure")) {
+                } else if (opt.equals("--dismiss-keyguard-if-insecure")
+                      || opt.equals("--dismiss-keyguard")) {
                     mDismissKeyguardIfInsecure = true;
                 } else {
                     return false;