From 01a9c15353f0580657556c80ebb9caa095b1b73d Mon Sep 17 00:00:00 2001
From: Matt Pape <mpape@google.com>
Date: Mon, 29 Oct 2018 09:53:04 -0700
Subject: [PATCH] Forward 'help' and '-h' to default implementation for
 ShellCommand.

This makes 'adb shell settings help' and 'adb shell settings -h' work.

Previously:
 $ adb shell settings help
 Invalid command: help

Updated:
 $ adb shell settings help
 Settings provider (settings) commands:
   help
       Print this help text.
   get [--user <USER_ID> | current] NAMESPACE KEY
 ...

Test: adb tested on local devices.

bug: 113100523

Change-Id: Ifc3f541aa12da9c79b9b7e9db0e30d4aace3392a
---
 .../src/com/android/providers/settings/SettingsService.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsService.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsService.java
index a6fadf967f9a7..379cfc70b7baf 100644
--- 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);
             }