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

Commit 9062fd8d authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by Android Git Automerger
Browse files

am 50fc82fd: am 30b074fc: am 2495d08a: am 5327322a: Merge "Revert "Fix a bug... 

am 50fc82fd: am 30b074fc: am 2495d08a: am 5327322a: Merge "Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"" into jb-mr1.1-dev

* commit '50fc82fd':
  Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"
parents b70d9df7 50fc82fd

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

+0 −9
Original line number Diff line number Diff line
@@ -782,9 +782,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
        if (!isSystemIme(imi)) {

            return false;

        }

        if (imi.isAuxiliaryIme()) {

            return false;

        }

        if (imi.getIsDefaultResourceId() != 0) {

            try {

                Resources res = context.createPackageContext(
@@ -808,9 +805,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
        if (!isSystemIme(imi)) {

            return false;

        }

        if (imi.isAuxiliaryIme()) {

            return false;

        }

        return containsSubtypeOf(imi, ENGLISH_LOCALE.getLanguage());

    }
@@ -2864,9 +2858,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
        List<Pair<String, ArrayList<String>>> enabledInputMethodsList = mSettings

                .getEnabledInputMethodsAndSubtypeListLocked();



        if (DEBUG) {

            Slog.d(TAG, (enabled ? "Enable " : "Disable ") + id);

        }

        if (enabled) {

            for (Pair<String, ArrayList<String>> pair: enabledInputMethodsList) {

                if (pair.first.equals(id)) {