Merge "Update shortcut IME info before checking availability of it"

This commit is contained in:
Tadashi G. Takaoka 2014-01-06 03:07:23 +00:00 committed by Android (Google) Code Review
commit e91559a119

View file

@ -226,6 +226,7 @@ public final class SubtypeSwitcher {
}
public boolean isShortcutImeEnabled() {
updateShortcutIME();
if (mShortcutInputMethodInfo == null) {
return false;
}
@ -237,10 +238,13 @@ public final class SubtypeSwitcher {
}
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;
}