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

Merge "Let "ime enable/set" return exit code 255 when failed" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-14 23:08:14 +00:00
committed by Android (Google) Code Review
parent e0ee346120 4a011f69ec
commit 0cc80c7bcf
1 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5761,6 +5761,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
final String imeId = shellCommand.getNextArgRequired(); final String imeId = shellCommand.getNextArgRequired();
final PrintWriter out = shellCommand.getOutPrintWriter(); final PrintWriter out = shellCommand.getOutPrintWriter();
final PrintWriter error = shellCommand.getErrPrintWriter(); final PrintWriter error = shellCommand.getErrPrintWriter();
boolean hasFailed = false;
synchronized (mMethodMap) { synchronized (mMethodMap) {
final int[] userIds = InputMethodUtils.resolveUserId(userIdToBeResolved, final int[] userIds = InputMethodUtils.resolveUserId(userIdToBeResolved,
mSettings.getCurrentUserId(), shellCommand.getErrPrintWriter()); mSettings.getCurrentUserId(), shellCommand.getErrPrintWriter());
@@ -5768,11 +5769,11 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
if (!userHasDebugPriv(userId, shellCommand)) { if (!userHasDebugPriv(userId, shellCommand)) {
continue; continue;
} }
handleShellCommandEnableDisableInputMethodInternalLocked(userId, imeId, enabled, hasFailed |= !handleShellCommandEnableDisableInputMethodInternalLocked(
out, error); userId, imeId, enabled, out, error);
} }
} }
return ShellCommandResult.SUCCESS; return hasFailed ? ShellCommandResult.FAILURE : ShellCommandResult.SUCCESS;
} }
/** /**
@@ -5804,8 +5805,18 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
return UserHandle.USER_CURRENT; return UserHandle.USER_CURRENT;
} }
/**
* Handles core logic of {@code adb shell ime enable} and {@code adb shell ime disable}.
*
* @param userId user ID specified to the command. Pseudo user IDs are not supported.
* @param imeId IME ID specified to the command.
* @param enabled {@code true} for {@code adb shell ime enable}. {@code false} otherwise.
* @param out {@link PrintWriter} to output standard messages.
* @param error {@link PrintWriter} to output error messages.
* @return {@code false} if it fails to enable the IME. {@code false} otherwise.
*/
@BinderThread @BinderThread
private void handleShellCommandEnableDisableInputMethodInternalLocked( private boolean handleShellCommandEnableDisableInputMethodInternalLocked(
@UserIdInt int userId, String imeId, boolean enabled, PrintWriter out, @UserIdInt int userId, String imeId, boolean enabled, PrintWriter out,
PrintWriter error) { PrintWriter error) {
boolean failedToEnableUnknownIme = false; boolean failedToEnableUnknownIme = false;
@@ -5851,7 +5862,12 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
error.print("Unknown input method "); error.print("Unknown input method ");
error.print(imeId); error.print(imeId);
error.println(" cannot be enabled for user #" + userId); error.println(" cannot be enabled for user #" + userId);
} else { // Also print this failure into logcat for better debuggability.
Slog.e(TAG, "\"ime enable " + imeId + "\" for user #" + userId
+ " failed due to its unrecognized IME ID.");
return false;
}
out.print("Input method "); out.print("Input method ");
out.print(imeId); out.print(imeId);
out.print(": "); out.print(": ");
@@ -5859,7 +5875,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
out.print(enabled ? "enabled" : "disabled"); out.print(enabled ? "enabled" : "disabled");
out.print(" for user #"); out.print(" for user #");
out.println(userId); out.println(userId);
} return true;
} }
/** /**
@@ -5874,6 +5890,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
final String imeId = shellCommand.getNextArgRequired(); final String imeId = shellCommand.getNextArgRequired();
final PrintWriter out = shellCommand.getOutPrintWriter(); final PrintWriter out = shellCommand.getOutPrintWriter();
final PrintWriter error = shellCommand.getErrPrintWriter(); final PrintWriter error = shellCommand.getErrPrintWriter();
boolean hasFailed = false;
synchronized (mMethodMap) { synchronized (mMethodMap) {
final int[] userIds = InputMethodUtils.resolveUserId(userIdToBeResolved, final int[] userIds = InputMethodUtils.resolveUserId(userIdToBeResolved,
mSettings.getCurrentUserId(), shellCommand.getErrPrintWriter()); mSettings.getCurrentUserId(), shellCommand.getErrPrintWriter());
@@ -5887,15 +5904,19 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
error.print(imeId); error.print(imeId);
error.print(" cannot be selected for user #"); error.print(" cannot be selected for user #");
error.println(userId); error.println(userId);
// Also print this failure into logcat for better debuggability.
Slog.e(TAG, "\"ime set " + imeId + "\" for user #" + userId
+ " failed due to its unrecognized IME ID.");
} else { } else {
out.print("Input method "); out.print("Input method ");
out.print(imeId); out.print(imeId);
out.print(" selected for user #"); out.print(" selected for user #");
out.println(userId); out.println(userId);
} }
hasFailed |= failedToSelectUnknownIme;
} }
} }
return ShellCommandResult.SUCCESS; return hasFailed ? ShellCommandResult.FAILURE : ShellCommandResult.SUCCESS;
} }
/** /**