diff --git a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
index 152605052f7efb1e0f2aa1ad54f3b446ee98a12a..a5bfdeb94a6056856c4616d6b269167dc058dbaf 100644
--- a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
+++ b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
@@ -132,7 +132,8 @@ public class SubtypeSwitcher {
     // Reload enabledSubtypes from the framework.
     private void updateEnabledSubtypes() {
         boolean foundCurrentSubtypeBecameDisabled = true;
-        mAllEnabledSubtypesOfCurrentInputMethod = mImm.getEnabledInputMethodSubtypeList(null);
+        mAllEnabledSubtypesOfCurrentInputMethod = mImm.getEnabledInputMethodSubtypeList(
+                null, false);
         mEnabledLanguagesOfCurrentInputMethod.clear();
         mEnabledKeyboardSubtypesOfCurrentInputMethod.clear();
         for (InputMethodSubtype ims: mAllEnabledSubtypesOfCurrentInputMethod) {
diff --git a/java/src/com/android/inputmethod/latin/Utils.java b/java/src/com/android/inputmethod/latin/Utils.java
index 5c69809264a0c542b0180143130987897b5011d7..0adca0d14d820c87904508ce7ee9d746f959c502 100644
--- a/java/src/com/android/inputmethod/latin/Utils.java
+++ b/java/src/com/android/inputmethod/latin/Utils.java
@@ -90,9 +90,9 @@ public class Utils {
 
     public static boolean hasMultipleEnabledIMEsOrSubtypes(InputMethodManager imm) {
         return imm.getEnabledInputMethodList().size() > 1
-        // imm.getEnabledInputMethodSubtypeList(null) will return the current IME's enabled input
-        // method subtype (The current IME should be LatinIME.)
-                || imm.getEnabledInputMethodSubtypeList(null).size() > 1;
+        // imm.getEnabledInputMethodSubtypeList(null, false) will return the current IME's enabled
+        // input method subtype (The current IME should be LatinIME.)
+                || imm.getEnabledInputMethodSubtypeList(null, false).size() > 1;
     }
 
     /* package */ static class RingCharBuffer {