Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: c11158301a

Change-Id: Ieb7c0c7bb444390b5450f50bee0df19094ed2cf4
This commit is contained in:
Yohei Yukawa
2017-10-27 01:35:18 +00:00
committed by android-build-merger
parent b80301cf5a c11158301a
commit 2832be2e98
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/InputMethodManagerService.java
View File

@@ -1470,7 +1470,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
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,