diff options
| author |   satok <satok@google.com> | 2011-03-25 20:01:24 -0700 |
|---|---|---|
| committer | satok <satok@google.com> | 2011-03-25 20:01:24 -0700 |
| commit | cf383a8175593aaba287903661889bbb1a34b152 (patch) | |
| tree | 0b5578e858d79edaf5fa2e2e15f15ea88aafd948 /java/src | |
| parent | 9115dd272328def247116ccf1ce458d360fec4ad (diff) | |
| download | latinime-cf383a8175593aaba287903661889bbb1a34b152.tar.gz latinime-cf383a8175593aaba287903661889bbb1a34b152.tar.xz latinime-cf383a8175593aaba287903661889bbb1a34b152.zip | |
Fix a NPE in InputMethodManagerCompatWrapper
Change-Id: Ia7c9b7135ba38a8df29464f7776b51d412f71acb
Diffstat (limited to 'java/src')
| -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); } |