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

Commit 2656abe0 authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by Android (Google) Code Review
Browse files

Merge "Fix an inconsistent state with IMMS and Settings when the hard keyboard... 

Merge "Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected" into jb-mr1.1-dev
parents e007c0e8 15451bd7

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

                }