diff options
| author | Satoshi Kataoka <satok@google.com> | 2012-11-17 22:01:57 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-17 22:01:57 -0800 |
| commit | 1ee199a4c6dba6153c49d3d24cce39acb5439a4f (patch) | |
| tree | 2e25b16073418f0f6adac1036e92c43a23356a86 /services/java | |
| parent | ee16821464479fd71e5c7090f135f0ae60c45b75 (diff) | |
| parent | 9371747e752236727be58149a8d04248860c134f (diff) | |
| download | frameworks_base-1ee199a4c6dba6153c49d3d24cce39acb5439a4f.zip frameworks_base-1ee199a4c6dba6153c49d3d24cce39acb5439a4f.tar.gz frameworks_base-1ee199a4c6dba6153c49d3d24cce39acb5439a4f.tar.bz2 | |
am 9371747e: am 0e1c092a: am 2656abe0: Merge "Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected" into jb-mr1.1-dev
* commit '9371747e752236727be58149a8d04248860c134f':
Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/InputMethodManagerService.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java index 9c533da..0299948 100644 --- a/services/java/com/android/server/InputMethodManagerService.java +++ b/services/java/com/android/server/InputMethodManagerService.java @@ -2486,10 +2486,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub map.put(id, p); // Valid system default IMEs and IMEs that have English subtypes are enabled - // by default, unless there's a hard keyboard and the system IME was explicitly - // disabled - if ((isValidSystemDefaultIme(p, mContext) || isSystemImeThatHasEnglishSubtype(p)) - && (!haveHardKeyboard || disabledSysImes.indexOf(id) < 0)) { + // by default + if ((isValidSystemDefaultIme(p, mContext) || isSystemImeThatHasEnglishSubtype(p))) { setInputMethodEnabledLocked(id, true); } |