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

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

diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java
index 81ae101..91ac1de 100644 (file)
--- a/services/java/com/android/server/InputMethodManagerService.java
+++ b/services/java/com/android/server/InputMethodManagerService.java
@@ -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)) {