diff options
| author | Satoshi Kataoka <satok@google.com> | 2012-11-16 13:17:54 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2012-11-16 13:30:56 +0900 |
| commit | 15451bd7afedb98a84574f69086936f883371c83 (patch) | |
| tree | eb5dd08e8594072bdec7b27e462ca53c7e744940 /services/java/com/android/server/InputMethodManagerService.java | |
| parent | e3ac532115f51513fe86ab29e1f76734ece6809b (diff) | |
| download | frameworks_base-15451bd7afedb98a84574f69086936f883371c83.zip frameworks_base-15451bd7afedb98a84574f69086936f883371c83.tar.gz frameworks_base-15451bd7afedb98a84574f69086936f883371c83.tar.bz2 | |
Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected
Bug: 7540140
Change-Id: Iaac951ff457c35751b442e84ac07f1f86be93494
Diffstat (limited to 'services/java/com/android/server/InputMethodManagerService.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 c9ff595..da6f1fa 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); } |