From 829b97b28d948cbdd38b6d9997e62a2a2eecf60b Mon Sep 17 00:00:00 2001
From: satok <satok@google.com>
Date: Fri, 25 Mar 2011 17:06:35 -0700
Subject: Fix lib and compat bugs.

Compat issues will be merged to master.

Change-Id: I3285606006483e247bea25ee77979cf71095b9c1
---
 .../android/inputmethod/compat/InputMethodManagerCompatWrapper.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java')

diff --git a/java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java b/java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java
index e0d54da3b..5f3c60b93 100644
--- a/java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java
+++ b/java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java
@@ -24,6 +24,7 @@ import android.view.inputmethod.InputMethodManager;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -78,7 +79,8 @@ public class InputMethodManagerCompatWrapper {
     public Map<InputMethodInfoCompatWrapper, List<InputMethodSubtypeCompatWrapper>>
             getShortcutInputMethodsAndSubtypes() {
         Object retval = CompatUtils.invoke(mImm, null, METHOD_getShortcutInputMethodsAndSubtypes);
-        if (!(retval instanceof Map)) return null;
+        // Returns an empty map
+        if (!(retval instanceof Map)) return Collections.emptyMap();
         Map<InputMethodInfoCompatWrapper, List<InputMethodSubtypeCompatWrapper>> shortcutMap =
                 new HashMap<InputMethodInfoCompatWrapper, List<InputMethodSubtypeCompatWrapper>>();
         final Map<?, ?> retvalMap = (Map<?, ?>)retval;
-- 
cgit v1.2.3-83-g751a