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

Commit 8d2320a7 authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge "locksettings: allow {get,set}-disabled without providing current LSKF"... 

Merge "locksettings: allow {get,set}-disabled without providing current LSKF" into udc-dev am: 1b5a3d7c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22162529



Change-Id: I8810e97e135cb1052a938be74a38a79647fd02d0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9f671d8e 1b5a3d7c

services/core/java/com/android/server/locksettings/LockSettingsShellCommand.java

+8 −6
Original line number Diff line number Diff line
@@ -106,6 +106,14 @@ class LockSettingsShellCommand extends ShellCommand { 
                case COMMAND_HELP:

                    onHelp();

                    return 0;

                case COMMAND_GET_DISABLED:

                    runGetDisabled();

                    return 0;

                case COMMAND_SET_DISABLED:

                    // Note: if the user has an LSKF, then this has no immediate effect but instead

                    // just ensures the lockscreen will be disabled later when the LSKF is cleared.

                    runSetDisabled();

                    return 0;

            }

            if (!checkCredential()) {

                return -1;
@@ -124,15 +132,9 @@ class LockSettingsShellCommand extends ShellCommand { 
                case COMMAND_CLEAR:

                    success = runClear();

                    break;

                case COMMAND_SET_DISABLED:

                    runSetDisabled();

                    break;

                case COMMAND_VERIFY:

                    runVerify();

                    break;

                case COMMAND_GET_DISABLED:

                    runGetDisabled();

                    break;

                default:

                    getErrPrintWriter().println("Unknown command: " + cmd);

                    break;