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

Commit 2832be2e 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 

am: c1115830

Change-Id: Ieb7c0c7bb444390b5450f50bee0df19094ed2cf4
parents b80301cf c1115830

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

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

                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,