Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a337c5f8 authored by Robin Lee's avatar Robin Lee
Browse files

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
parent c1607eef

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

+2 −1
Original line number Diff line number Diff line
@@ -552,7 +552,8 @@ final class ActivityManagerShellCommand extends ShellCommand { 
                    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;