am 32b81205: Fix a bug where disabled auxilialy IME is unexpectedly re-enabled

* commit '32b812054cce27d1c70b53ba8ac729c7186b105e':
  Fix a bug where disabled auxilialy IME is unexpectedly re-enabled

1 files changed, 9 insertions, 0 deletions

diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java
index a296d34498dc..cd920b1d6ae0 100644
--- a/services/java/com/android/server/InputMethodManagerService.java
+++ b/services/java/com/android/server/InputMethodManagerService.java
@@ -782,6 +782,9 @@ 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(
@@ -805,6 +808,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
         if (!isSystemIme(imi)) {
             return false;
         }
+        if (imi.isAuxiliaryIme()) {
+            return false;
+        }
         return containsSubtypeOf(imi, ENGLISH_LOCALE.getLanguage());
     }
 
@@ -2856,6 +2862,9 @@ 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)) {