commit 111b763d85b2a4efd47b195756b42c48f2935bda
author Yohei Yukawa <yukawa@google.com> Tue Sep 04 10:55:53 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Sep 04 10:55:53 2018 -0700
tree 81af63d51aba716ac202e15cbc0990ab0a317699
parent 77893e4032fdd82855c5ba47a05cf5b3e5761c93
parent 55e0bad720379afa5c6de5417cc4e01c743bd776

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

Change-Id: Idfe170b58bb07ba4775629d094b508c17a9aba9b

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 665c6b7..aa1b303 100644
--- a/services/core/java/com/android/server/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/InputMethodManagerService.java
@@ -1561,7 +1561,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,