diff options
| author | 2017-10-27 01:10:36 +0000 | |
|---|---|---|
| committer | 2017-10-27 01:10:36 +0000 | |
| commit | 9e5c77c194a1449d52db1176efb2bc96844520d9 (patch) | |
| tree | f8d59ba31ded1bf116f0df1567eca32e75ca60e3 | |
| parent | 93134fea64436150aa5e4660d7632dd2097eede9 (diff) | |
| parent | 171c82acb477bda381845cbe4fa47c74e0fb78eb (diff) | |
Merge "IMMS should preserve enabled/selected IMEs upon boot"
am: 171c82acb4
Change-Id: I13b12269eb1cd29bb28bd6a1dadac59a2d539380
| -rw-r--r-- | services/core/java/com/android/server/InputMethodManagerService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java index 192fa3a2bb38..6339c9e47b1e 100644 --- a/services/core/java/com/android/server/InputMethodManagerService.java +++ b/services/core/java/com/android/server/InputMethodManagerService.java @@ -1447,7 +1447,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub broadcastFilter.addAction(Intent.ACTION_LOCALE_CHANGED); 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, |