commit f65fd37910d485d9aa209e283cde111e3a3f7837
author Yohei Yukawa <yukawa@google.com> Tue Sep 04 10:31:58 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Sep 04 10:31:58 2018 -0700
tree 8cfbb8cfe5b042c8f3c6f972dd9a8034e21cd47e
parent 7361cbf56f0e52e99621b761bee64cc928b15f47
parent 154519eb527abe8fe0bbcc976f94bd6286ccc82f

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

Change-Id: I8c672c3a2457f775c07d97863baf05ad0fdc45c6

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,