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

Commit 7ad2c690 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

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

parents d7a733fd a337c5f8

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;