Tolerate "--dismiss-keyguard"
In UDC the flag was renamed to "--dismiss-keyguard" in a
change that has been reverted. Before and after, the
correct flag is "--dismiss-keyguard-if-insecure".
However, since UDC CTS passes in this flag, and must
pass against QPRs too, we need to accept this renamed
flag for at least the next year.
Change-Id: I5b4284a578ea917aef0304e05d27cbc512606d60
Test: Run UDC CTS KeyguardTests against 24Q1 Device
Fix: 310091307
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;