diff options
| author | satok <satok@google.com> | 2010-08-26 07:01:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-26 07:01:28 -0700 |
| commit | 15edaceb2d46f18c32fb20a3d3dae556c1078bb6 (patch) | |
| tree | 233cb50e7cee61f894fa0191645fb7efb9a82de3 /services/java | |
| parent | cfc3e71eae0c7f4f1b824b00d64cf268e646f702 (diff) | |
| parent | 913a8925c07e854a80bf5df87561f290d3a56d61 (diff) | |
| download | frameworks_base-15edaceb2d46f18c32fb20a3d3dae556c1078bb6.zip frameworks_base-15edaceb2d46f18c32fb20a3d3dae556c1078bb6.tar.gz frameworks_base-15edaceb2d46f18c32fb20a3d3dae556c1078bb6.tar.bz2 | |
am 913a8925: DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread
Merge commit '913a8925c07e854a80bf5df87561f290d3a56d61' into gingerbread-plus-aosp
* commit '913a8925c07e854a80bf5df87561f290d3a56d61':
DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/InputMethodManagerService.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java index 2e33cf1..c61baad 100644 --- a/services/java/com/android/server/InputMethodManagerService.java +++ b/services/java/com/android/server/InputMethodManagerService.java @@ -475,8 +475,10 @@ public class InputMethodManagerService extends IInputMethodManager.Stub mContext.getContentResolver(), Settings.Secure.ENABLED_INPUT_METHODS); Slog.i(TAG, "Enabled input methods: " + enabledStr); - if (enabledStr == null) { - Slog.i(TAG, "Enabled input methods has not been set, enabling all"); + final String defaultIme = Settings.Secure.getString(mContext + .getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD); + if (enabledStr == null || TextUtils.isEmpty(defaultIme)) { + Slog.i(TAG, "Enabled input methods or default IME has not been set, enabling all"); InputMethodInfo defIm = null; StringBuilder sb = new StringBuilder(256); final int N = mMethodList.size(); @@ -981,7 +983,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub void setInputMethodLocked(String id) { InputMethodInfo info = mMethodMap.get(id); if (info == null) { - throw new IllegalArgumentException("Unknown id: " + mCurMethodId); + throw new IllegalArgumentException("Unknown id: " + id); } if (id.equals(mCurMethodId)) { @@ -1479,7 +1481,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub String defaultIme = Settings.Secure.getString(mContext .getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD); - if (!map.containsKey(defaultIme)) { + if (!TextUtils.isEmpty(defaultIme) && !map.containsKey(defaultIme)) { if (chooseNewDefaultIMELocked()) { updateFromSettingsLocked(); } |