Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Eric Biggers
2023-03-21 20:05:11 +00:00
committed by Android (Google) Code Review
parent 6b539038e9 cb94dbee93
commit 1b5a3d7c52
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/locksettings/LockSettingsShellCommand.java
View File

@@ -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;