commit 15451bd7afedb98a84574f69086936f883371c83
author Satoshi Kataoka <satok@google.com> Fri Nov 16 13:17:54 2012 +0900
committer satok <satok@google.com> Fri Nov 16 13:30:56 2012 +0900
tree eb5dd08e8594072bdec7b27e462ca53c7e744940
parent e3ac532115f51513fe86ab29e1f76734ece6809b

Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected

Bug: 7540140
Change-Id: Iaac951ff457c35751b442e84ac07f1f86be93494

services/java/com/android/server/InputMethodManagerService.java

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 @@
                 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);
                 }