From 15451bd7afedb98a84574f69086936f883371c83 Mon Sep 17 00:00:00 2001 From: Satoshi Kataoka Date: Fri, 16 Nov 2012 13:17:54 +0900 Subject: 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 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to '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 @@ 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); } -- cgit v1.1