commit 55e0bad720379afa5c6de5417cc4e01c743bd776
author Yohei Yukawa <yukawa@google.com> Tue Sep 04 10:43:18 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Sep 04 10:43:18 2018 -0700
tree cba0b683e51d55959d3941942602cfbe5b7841d4
parent 6bf2079272e1cb57baa06e04072f16b99609ac76
parent f65fd37910d485d9aa209e283cde111e3a3f7837

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

Change-Id: Id8a482c02f7eedede0f43cf741e8a5a924e48644

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

diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java
index 9367a83..44bf2a5 100644
--- a/services/core/java/com/android/server/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/InputMethodManagerService.java
@@ -1544,7 +1544,6 @@
                 final String defaultImiId = mSettings.getSelectedInputMethod();
                 final boolean imeSelectedOnBoot = !TextUtils.isEmpty(defaultImiId);
                 buildInputMethodListLocked(!imeSelectedOnBoot /* resetDefaultEnabledIme */);
-                resetDefaultImeLocked(mContext);
                 updateFromSettingsLocked(true);
                 InputMethodUtils.setNonSelectedSystemImesDisabledUntilUsed(mIPackageManager,
                         mSettings.getEnabledInputMethodListLocked(), currentUserId,