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

Commit c1115830 authored by Yohei Yukawa's avatar Yohei Yukawa Committed by android-build-merger
Browse files

Merge "IMMS should preserve enabled/selected IMEs upon boot" am: 171c82ac 

am: 9e5c77c1

Change-Id: I75ba9b67eb8c88931788c869d0ff5a25c950693e
parents 064b0648 9e5c77c1

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

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

                broadcastFilter.addAction(ACTION_SHOW_INPUT_METHOD_PICKER);

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

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





                buildInputMethodListLocked(true /* resetDefaultEnabledIme */);

                final String defaultImiId = mSettings.getSelectedInputMethod();

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

                buildInputMethodListLocked(!imeSelectedOnBoot /* resetDefaultEnabledIme */);

                resetDefaultImeLocked(mContext);

                resetDefaultImeLocked(mContext);

                updateFromSettingsLocked(true);

                updateFromSettingsLocked(true);

                InputMethodUtils.setNonSelectedSystemImesDisabledUntilUsed(mIPackageManager,

                InputMethodUtils.setNonSelectedSystemImesDisabledUntilUsed(mIPackageManager,