Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc1a5c9e authored by Yohei Yukawa's avatar Yohei Yukawa Committed by Automerger Merge Worker
Browse files

Merge "Make "adb shell cmd input_method tracing" official" into sc-dev am: 9e028b32 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13637327

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ife7565f80dea2d4c19ffb82d39518b083230769b
parents 4f2e8f64 9e028b32

services/core/java/com/android/server/inputmethod/InputMethodManagerService.java

+7 −1
Original line number Original line Diff line number Diff line
@@ -5417,6 +5417,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
            switch (TextUtils.emptyIfNull(cmd)) {

            switch (TextUtils.emptyIfNull(cmd)) {

                case "get-last-switch-user-id":

                case "get-last-switch-user-id":

                    return mService.getLastSwitchUserId(this);

                    return mService.getLastSwitchUserId(this);

                case "tracing":

                    return mService.handleShellCommandTraceInputMethod(this);

                case "ime": {  // For "adb shell ime <command>".

                case "ime": {  // For "adb shell ime <command>".

                    final String imeCommand = TextUtils.emptyIfNull(getNextArg());

                    final String imeCommand = TextUtils.emptyIfNull(getNextArg());

                    switch (imeCommand) {

                    switch (imeCommand) {
@@ -5434,7 +5436,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
                            return mService.handleShellCommandSetInputMethod(this);

                            return mService.handleShellCommandSetInputMethod(this);

                        case "reset":

                        case "reset":

                            return mService.handleShellCommandResetInputMethod(this);

                            return mService.handleShellCommandResetInputMethod(this);

                        case "tracing":

                        case "tracing":  // TODO(b/180765389): Unsupport "adb shell ime tracing"

                            return mService.handleShellCommandTraceInputMethod(this);

                            return mService.handleShellCommandTraceInputMethod(this);

                        default:

                        default:

                            getOutPrintWriter().println("Unknown command: " + imeCommand);

                            getOutPrintWriter().println("Unknown command: " + imeCommand);
@@ -5457,6 +5459,10 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
                pw.println("    Synonym of dumpsys.");

                pw.println("    Synonym of dumpsys.");

                pw.println("  ime <command> [options]");

                pw.println("  ime <command> [options]");

                pw.println("    Manipulate IMEs.  Run \"ime help\" for details.");

                pw.println("    Manipulate IMEs.  Run \"ime help\" for details.");

                pw.println("  tracing <command>");

                pw.println("    start: Start tracing.");

                pw.println("    stop : Stop tracing.");

                pw.println("    help : Show help.");

            }

            }

        }

        }