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

Commit 171c82ac authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "IMMS should preserve enabled/selected IMEs upon boot"

parents 9009eabb 1f9a3cbe

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

+3 −1
Original line number Diff line number Diff line
@@ -1447,7 +1447,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
                broadcastFilter.addAction(Intent.ACTION_LOCALE_CHANGED);

                mContext.registerReceiver(new ImmsBroadcastReceiver(), broadcastFilter);



                buildInputMethodListLocked(true /* resetDefaultEnabledIme */);

                final String defaultImiId = mSettings.getSelectedInputMethod();

                final boolean imeSelectedOnBoot = !TextUtils.isEmpty(defaultImiId);

                buildInputMethodListLocked(!imeSelectedOnBoot /* resetDefaultEnabledIme */);

                resetDefaultImeLocked(mContext);

                updateFromSettingsLocked(true);

                InputMethodUtils.setNonSelectedSystemImesDisabledUntilUsed(mIPackageManager,