Merge "IMMS should preserve selected IME upon boot"

am: 154519eb52 Change-Id: I8c672c3a2457f775c07d97863baf05ad0fdc45c6
2018-09-04 10:31:58 -07:00
parent 7361cbf56f 154519eb52
commit f65fd37910
1 changed files with 0 additions and 1 deletions
--- a/services/core/java/com/android/server/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/InputMethodManagerService.java
@@ -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,