diff options
| author |   satok <satok@google.com> | 2011-04-27 17:23:05 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2011-04-27 17:23:05 +0900 |
| commit | 31da2ea24bee6124feebb5fd1a010fc6c62946a0 (patch) | |
| tree | 755fde89fe654f00eae61eb792bfe72661af385d /java/src/com/android/inputmethod/compat | |
| parent | 0dbb7e26d1e719251f66bf2f5034330e13bb5c3f (diff) | |
| parent | 19bfef6cb0714a46a276abe45329e4abb661f76e (diff) | |
| download | latinime-31da2ea24bee6124feebb5fd1a010fc6c62946a0.tar.gz latinime-31da2ea24bee6124feebb5fd1a010fc6c62946a0.tar.xz latinime-31da2ea24bee6124feebb5fd1a010fc6c62946a0.zip | |
Merge remote-tracking branch 'goog/master' into merge
Diffstat (limited to 'java/src/com/android/inputmethod/compat')
| -rw-r--r-- | java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java b/java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java index d99f40765..1cc13f249 100644 --- a/java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java +++ b/java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java @@ -118,7 +118,7 @@ public class InputMethodManagerCompatWrapper { } Object retval = CompatUtils.invoke(mImm, null, METHOD_getEnabledInputMethodSubtypeList, (imi != null ? imi.getInputMethodInfo() : null), allowsImplicitlySelectedSubtypes); - if (retval == null || !(retval instanceof List) || ((List<?>)retval).isEmpty()) { + if (retval == null || !(retval instanceof List<?>) || ((List<?>)retval).isEmpty()) { if (!FORCE_ENABLE_VOICE_EVEN_WITH_NO_VOICE_SUBTYPES) { // Returns an empty list return Collections.emptyList(); @@ -137,7 +137,7 @@ public class InputMethodManagerCompatWrapper { } return subtypeList; } - return CompatUtils.copyInputMethodSubtypeListToWrapper((List<?>)retval); + return CompatUtils.copyInputMethodSubtypeListToWrapper(retval); } private InputMethodInfoCompatWrapper getLatinImeInputMethodInfo() { @@ -159,7 +159,7 @@ public class InputMethodManagerCompatWrapper { public Map<InputMethodInfoCompatWrapper, List<InputMethodSubtypeCompatWrapper>> getShortcutInputMethodsAndSubtypes() { Object retval = CompatUtils.invoke(mImm, null, METHOD_getShortcutInputMethodsAndSubtypes); - if (retval == null || !(retval instanceof Map) || ((Map<?, ?>)retval).isEmpty()) { + if (retval == null || !(retval instanceof Map<?, ?>) || ((Map<?, ?>)retval).isEmpty()) { if (!FORCE_ENABLE_VOICE_EVEN_WITH_NO_VOICE_SUBTYPES) { // Returns an empty map return Collections.emptyMap(); |