summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yohei Yukawa <yukawa@google.com> 2024-08-06 16:20:02 +0000
committer Yohei Yukawa <yukawa@google.com> 2024-08-06 17:09:45 +0000
commit1bc8c46bcf60651050ad1fc33e1ec4e97fecb575 (patch)
tree13d929ea690e572872545c52aee90414f14290e8
parenta23fb054dbdd1b801426dd735460cf98ac76d658 (diff)
Revert "Work around not working "ime set <imeId>""
This reverts commit a23fb054dbdd1b801426dd735460cf98ac76d658. Reason for revert: Broke VirtualDeviceImeTest#customImeComponent_changeDefaultDeviceIme. The root cause and long term fix will be discussed at Bug 357868762. Bug: 354782333 Fix: 357743677 Test: presubmit Test: CtsVirtualDevicesAppLaunchTestCases:VirtualDeviceImeTest Flag: TEST_ONLY Change-Id: I5656a92a5a64180e4be5b5e65b0d2fc383678aee
-rw-r--r--services/core/java/com/android/server/inputmethod/InputMethodManagerService.java11
1 files changed, 0 insertions, 11 deletions
diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
index 0c9848edcc06..e4ae569f5f35 100644
--- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
@@ -6718,17 +6718,6 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
out.print(imeId);
out.print(" selected for user #");
out.println(userId);
-
- // Workaround for b/354782333.
- final var settingsValue = SecureSettingsWrapper.getString(
- Settings.Secure.DEFAULT_INPUT_METHOD, "", userId);
- if (!TextUtils.equals(settingsValue, imeId)) {
- Slog.w(TAG, "DEFAULT_INPUT_METHOD=" + settingsValue
- + " is not updated. Fixing it up to " + imeId
- + " See b/354782333.");
- SecureSettingsWrapper.putString(
- Settings.Secure.DEFAULT_INPUT_METHOD, imeId, userId);
- }
}
hasFailed |= failedToSelectUnknownIme;
}