Merge "IMMS should preserve enabled/selected IMEs upon boot" am: 171c82acb4

am: 9e5c77c194

Change-Id: I75ba9b67eb8c88931788c869d0ff5a25c950693e

diff --cc services/core/java/com/android/server/InputMethodManagerService.java
index c23757f,6339c9e..3ee798b
--- 1/services/core/java/com/android/server/InputMethodManagerService.java
--- 2/services/core/java/com/android/server/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/InputMethodManagerService.java
@@@ -1466,10 -1445,11 +1466,12 @@@ public class InputMethodManagerService 
                  broadcastFilter.addAction(Intent.ACTION_USER_REMOVED);
                  broadcastFilter.addAction(Intent.ACTION_SETTING_RESTORED);
                  broadcastFilter.addAction(Intent.ACTION_LOCALE_CHANGED);
 +                broadcastFilter.addAction(ACTION_SHOW_INPUT_METHOD_PICKER);
                  mContext.registerReceiver(new ImmsBroadcastReceiver(), broadcastFilter);
  
-                 buildInputMethodListLocked(true /* resetDefaultEnabledIme */);
+                 final String defaultImiId = mSettings.getSelectedInputMethod();
+                 final boolean imeSelectedOnBoot = !TextUtils.isEmpty(defaultImiId);
+                 buildInputMethodListLocked(!imeSelectedOnBoot /* resetDefaultEnabledIme */);
                  resetDefaultImeLocked(mContext);
                  updateFromSettingsLocked(true);
                  InputMethodUtils.setNonSelectedSystemImesDisabledUntilUsed(mIPackageManager,