commit 6a9f0db202749724373fcd525564e84e1cea3ce9
author satok <satok@google.com> Mon Sep 05 02:39:58 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 05 02:39:58 2011 -0700
tree 053309063b790abb1b49b20cd97b1012c9e5519a
parent 1d8ec1cb9fb2c395873566438fe63e46b9e535da
parent 0cba0c11f64115933783627a31525cca9a2f32d9

Merge "Support automatic language"

java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatWrapper.java

diff --git a/java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatWrapper.java b/java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatWrapper.java
index b6b86a4..a6bb83a 100644
--- a/java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatWrapper.java
+++ b/java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatWrapper.java
@@ -100,8 +100,7 @@
     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() {