Merge "Support automatic language"

2011-09-05 02:39:58 -07:00 · 2011-09-05 02:39:58 -07:00 · 6a9f0db202
parent 1d8ec1cb9f 0cba0c11f6
commit 6a9f0db202
1 changed files with 1 additions and 2 deletions
--- a/java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatWrapper.java
+++ b/java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatWrapper.java
@ -100,8 +100,7 @@ public final class InputMethodSubtypeCompatWrapper extends AbstractCompatWrapper
    public String getLocale() {
        if (mObj == null) return mDummyLocale;
        final String s = (String)CompatUtils.invoke(mObj, null, METHOD_getLocale);
-        if (TextUtils.isEmpty(s)) return DEFAULT_LOCALE;
-        return s;
+        return s != null ? s : DEFAULT_LOCALE;
    }

    public String getMode() {