Update shortcut IME info before checking availability of it
Bug: 12377179
Change-Id: I4e2de78dc7e21f3f34eb56c790160b77cfc7584c
diff --git a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
index 379eaaa..b0ab603 100644
--- a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
+++ b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
@@ -226,6 +226,7 @@
}
public boolean isShortcutImeEnabled() {
+ updateShortcutIME();
if (mShortcutInputMethodInfo == null) {
return false;
}
@@ -237,10 +238,13 @@
}
public boolean isShortcutImeReady() {
- if (mShortcutInputMethodInfo == null)
+ updateShortcutIME();
+ if (mShortcutInputMethodInfo == null) {
return false;
- if (mShortcutSubtype == null)
+ }
+ if (mShortcutSubtype == null) {
return true;
+ }
if (mShortcutSubtype.containsExtraValueKey(REQ_NETWORK_CONNECTIVITY)) {
return mIsNetworkConnected;
}