summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dave McCloskey <dlm@google.com> 2022-04-04 16:27:15 -0700
committer Dave McCloskey <dlm@google.com> 2022-04-05 17:06:15 +0000
commit5a608433a30d9a302ee631b776f435a1b6726e60 (patch)
treeb144e6ef290f141d551db3487fd498666701d79a
parent22f211ca1eb5c5f4f720ab042eff6a9cd084d0f1 (diff)
Update LockSettingsCmd's showUsage method to defer to calling
"locksettings help". This removes the duplication and also fixes the current behavior showing the incorrect documentation for "locksettings verify" which does *not* log in the user. Test: adb shell locksettings Test: adb shell locksettings clear --old 0000 (to verify other commands still work) Change-Id: I429288a9e4280d41213e1c0fd8234d3666888abc
-rw-r--r--cmds/locksettings/src/com/android/commands/locksettings/LockSettingsCmd.java32
1 files changed, 1 insertions, 31 deletions
diff --git a/cmds/locksettings/src/com/android/commands/locksettings/LockSettingsCmd.java b/cmds/locksettings/src/com/android/commands/locksettings/LockSettingsCmd.java
index 6a4a4beaa763..7d9260a77158 100644
--- a/cmds/locksettings/src/com/android/commands/locksettings/LockSettingsCmd.java
+++ b/cmds/locksettings/src/com/android/commands/locksettings/LockSettingsCmd.java
@@ -28,43 +28,13 @@ import java.io.PrintStream;
public final class LockSettingsCmd extends BaseCommand {
- private static final String USAGE =
- "usage: locksettings set-pattern [--old OLD_CREDENTIAL] NEW_PATTERN\n" +
- " locksettings set-pin [--old OLD_CREDENTIAL] NEW_PIN\n" +
- " locksettings set-password [--old OLD_CREDENTIAL] NEW_PASSWORD\n" +
- " locksettings clear [--old OLD_CREDENTIAL]\n" +
- " locksettings verify [--old OLD_CREDENTIAL]\n" +
- " locksettings set-disabled DISABLED\n" +
- " locksettings get-disabled\n" +
- "\n" +
- "flags: \n" +
- " --user USER_ID: specify the user, default value is current user\n" +
- "\n" +
- "locksettings set-pattern: sets a pattern\n" +
- " A pattern is specified by a non-separated list of numbers that index the cell\n" +
- " on the pattern in a 1-based manner in left to right and top to bottom order,\n" +
- " i.e. the top-left cell is indexed with 1, whereas the bottom-right cell\n" +
- " is indexed with 9. Example: 1234\n" +
- "\n" +
- "locksettings set-pin: sets a PIN\n" +
- "\n" +
- "locksettings set-password: sets a password\n" +
- "\n" +
- "locksettings clear: clears the unlock credential\n" +
- "\n" +
- "locksettings verify: verifies the credential and unlocks the user\n" +
- "\n" +
- "locksettings set-disabled: sets whether the lock screen should be disabled\n" +
- "\n" +
- "locksettings get-disabled: retrieves whether the lock screen is disabled\n";
-
public static void main(String[] args) {
(new LockSettingsCmd()).run(args);
}
@Override
public void onShowUsage(PrintStream out) {
- out.println(USAGE);
+ main(new String[] { "help" });
}
@Override