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

Commit 1bc8c46b authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Revert "Work around not working "ime set <imeId>"" 

This reverts commit a23fb054.

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
parent a23fb054

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

+0 −11
Original line number Diff line number Diff line
@@ -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;

                }