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

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

Merge "IMMS should preserve selected IME upon boot" am: 154519eb 

am: f65fd379

Change-Id: Id8a482c02f7eedede0f43cf741e8a5a924e48644
parents 6bf20792 f65fd379

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

+0 −1
Original line number Diff line number Diff line
@@ -1544,7 +1544,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
                final String defaultImiId = mSettings.getSelectedInputMethod();

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

                buildInputMethodListLocked(!imeSelectedOnBoot /* resetDefaultEnabledIme */);

                resetDefaultImeLocked(mContext);

                updateFromSettingsLocked(true);

                InputMethodUtils.setNonSelectedSystemImesDisabledUntilUsed(mIPackageManager,

                        mSettings.getEnabledInputMethodListLocked(), currentUserId,