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

Simplify IMMS#onCommandWithSystemIdentity()

Browse Source 
This is mechanical refacotring.  There should be no
developer-observable behavior change.

This is a preparation to fix Bug 180765389.

Bug: 180765389
Test: "adb shell ime" still shows help.
Test: "adb shell ime help" still works.
Test: "adb shell ime list" still works.
Test: "adb shell cmd input_method" still shows help.
Test: "adb shell cmd input_method dump" still works.
Test: "adb shell cmd input_method help" still works.
Test: "adb shell cmd input_method ime list" still works.
Change-Id: I2fb5d9d84d9e51890e432e996ca294778d507362
This commit is contained in:
Yohei Yukawa
2021-02-24 11:24:49 -08:00
parent be7698d68a
commit c59ba280cf
1 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
View File

@@ -5412,37 +5412,36 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
@BinderThread
@ShellCommandResult
private int onCommandWithSystemIdentity(@Nullable String cmd) {
if ("get-last-switch-user-id".equals(cmd)) {
return mService.getLastSwitchUserId(this);
}
// For existing "adb shell ime <command>".
if ("ime".equals(cmd)) {
final String imeCommand = getNextArg();
if (imeCommand == null || "help".equals(imeCommand) || "-h".equals(imeCommand)) {
onImeCommandHelp();
return ShellCommandResult.SUCCESS;
}
switch (imeCommand) {
case "list":
return mService.handleShellCommandListInputMethods(this);
case "enable":
return mService.handleShellCommandEnableDisableInputMethod(this, true);
case "disable":
return mService.handleShellCommandEnableDisableInputMethod(this, false);
case "set":
return mService.handleShellCommandSetInputMethod(this);
case "reset":
return mService.handleShellCommandResetInputMethod(this);
case "tracing":
return mService.handleShellCommandTraceInputMethod(this);
default:
getOutPrintWriter().println("Unknown command: " + imeCommand);
return ShellCommandResult.FAILURE;
switch (TextUtils.emptyIfNull(cmd)) {
case "get-last-switch-user-id":
return mService.getLastSwitchUserId(this);
case "ime": { // For "adb shell ime <command>".
final String imeCommand = TextUtils.emptyIfNull(getNextArg());
switch (imeCommand) {
case "":
case "-h":
case "help":
return onImeCommandHelp();
case "list":
return mService.handleShellCommandListInputMethods(this);
case "enable":
return mService.handleShellCommandEnableDisableInputMethod(this, true);
case "disable":
return mService.handleShellCommandEnableDisableInputMethod(this, false);
case "set":
return mService.handleShellCommandSetInputMethod(this);
case "reset":
return mService.handleShellCommandResetInputMethod(this);
case "tracing":
return mService.handleShellCommandTraceInputMethod(this);
default:
getOutPrintWriter().println("Unknown command: " + imeCommand);
return ShellCommandResult.FAILURE;
}
}
default:
return handleDefaultCommands(cmd);
}
return handleDefaultCommands(cmd);
}
@BinderThread
@@ -5459,7 +5458,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
}
}
private void onImeCommandHelp() {
@BinderThread
@ShellCommandResult
private int onImeCommandHelp() {
try (IndentingPrintWriter pw =
new IndentingPrintWriter(getOutPrintWriter(), " ", 100)) {
pw.println("ime <command>:");
@@ -5514,6 +5515,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
pw.decreaseIndent();
}
return ShellCommandResult.SUCCESS;
}
}