diff options
| author |   satok <satok@google.com> | 2011-03-25 20:20:32 -0700 |
|---|---|---|
| committer | satok <satok@google.com> | 2011-03-25 20:20:32 -0700 |
| commit | cb04314341e43bff65aa97ea6ae486d1c380a95d (patch) | |
| tree | 31c6f0e3758a296a2919aa8981b4b6f63d85c27a /java/src/com | |
| parent | e932a0ae78e17eba0512c81fe7388f01fd45466d (diff) | |
| parent | cf383a8175593aaba287903661889bbb1a34b152 (diff) | |
| download | latinime-cb04314341e43bff65aa97ea6ae486d1c380a95d.tar.gz latinime-cb04314341e43bff65aa97ea6ae486d1c380a95d.tar.xz latinime-cb04314341e43bff65aa97ea6ae486d1c380a95d.zip | |
Merge remote branch 'goog/master' into merge
Diffstat (limited to 'java/src/com')
| -rw-r--r-- | java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java b/java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java index 3bf0ed6b5..5e66bf4d9 100644 --- a/java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java +++ b/java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java @@ -75,6 +75,9 @@ public class InputMethodManagerCompatWrapper { InputMethodInfoCompatWrapper imi, boolean allowsImplicitlySelectedSubtypes) { Object retval = CompatUtils.invoke(mImm, null, METHOD_getEnabledInputMethodSubtypeList, (imi != null ? imi.getInputMethodInfo() : null), allowsImplicitlySelectedSubtypes); + // Returns an empty list + if (retval == null) + return Collections.emptyList(); return CompatUtils.copyInputMethodSubtypeListToWrapper((List<?>)retval); } |