3 files changed, 10 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/compat/AbstractCompatWrapper.java b/java/src/com/android/inputmethod/compat/AbstractCompatWrapper.java
index 99262c434..65949357f 100644
--- a/java/src/com/android/inputmethod/compat/AbstractCompatWrapper.java
+++ b/java/src/com/android/inputmethod/compat/AbstractCompatWrapper.java
@@ -32,4 +32,8 @@ public abstract class AbstractCompatWrapper {
     public Object getOriginalObject() {
         return mObj;
     }
+
+    public boolean hasOriginalObject() {
+        return mObj != null;
+    }
 }
diff --git a/java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java b/java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java
index 5f3c60b93..3bf0ed6b5 100644
--- a/java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java
+++ b/java/src/com/android/inputmethod/compat/InputMethodManagerCompatWrapper.java
@@ -44,6 +44,8 @@ public class InputMethodManagerCompatWrapper {
             CompatUtils.getMethod(
                     InputMethodManager.class, "setInputMethodAndSubtype", IBinder.class,
                     String.class, InputMethodSubtypeCompatWrapper.CLASS_InputMethodSubtype);
+    private static final Method METHOD_switchToLastInputMethod = CompatUtils.getMethod(
+            InputMethodManager.class, "switchToLastInputMethod", IBinder.class);
 
     private static final InputMethodManagerCompatWrapper sInstance =
             new InputMethodManagerCompatWrapper();
@@ -102,7 +104,7 @@ public class InputMethodManagerCompatWrapper {
     }
 
     public boolean switchToLastInputMethod(IBinder token) {
-        return false;
+        return (Boolean)CompatUtils.invoke(mImm, false, METHOD_switchToLastInputMethod, token);
     }
 
     public List<InputMethodInfoCompatWrapper> getEnabledInputMethodList() {
diff --git a/java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatWrapper.java b/java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatWrapper.java
index 011f524f8..3ffa81932 100644
--- a/java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatWrapper.java
+++ b/java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatWrapper.java
@@ -18,6 +18,7 @@ package com.android.inputmethod.compat;
 
 import com.android.inputmethod.latin.LatinImeLogger;
 
+import android.text.TextUtils;
 import android.util.Log;
 
 import java.lang.reflect.Method;
@@ -65,13 +66,13 @@ public final class InputMethodSubtypeCompatWrapper extends AbstractCompatWrapper
 
     public String getLocale() {
         final String s = (String)CompatUtils.invoke(mObj, null, METHOD_getLocale);
-        if (s == null) return DEFAULT_LOCALE;
+        if (TextUtils.isEmpty(s)) return DEFAULT_LOCALE;
         return s;
     }
 
     public String getMode() {
         String s = (String)CompatUtils.invoke(mObj, null, METHOD_getMode);
-        if (s == null) return DEFAULT_MODE;
+        if (TextUtils.isEmpty(s)) return DEFAULT_MODE;
         return s;
     }