Merge remote branch 'goog/master' into merge

main
satok 2011-03-25 20:20:32 -07:00
commit cb04314341
1 changed files with 3 additions and 0 deletions

View File

@ -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);
}