Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9371747e authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by Android Git Automerger
Browse files

am 0e1c092a: am 2656abe0: Merge "Fix an inconsistent state with IMMS and... 

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 '0e1c092a':
  Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected
parents 3e932c45 0e1c092a

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

+2 −4
Original line number Diff line number Diff line
@@ -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);

                }