Merge "Forward 'help' and '-h' to default implementation for ShellCommand."

2018-11-01 16:18:35 +00:00
parent 33c7610814 01a9c15353
commit 2e9f863406
1 changed files with 1 additions and 1 deletions
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsService.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsService.java
@@ -124,7 +124,7 @@ final public class SettingsService extends Binder {

        @Override
        public int onCommand(String cmd) {
-            if (cmd == null) {
+            if (cmd == null || "help".equals(cmd) || "-h".equals(cmd)) {
                return handleDefaultCommands(cmd);
            }