commit 0cba0c11f64115933783627a31525cca9a2f32d9
author satok <satok@google.com> Mon Sep 05 17:31:56 2011 +0900
committer satok <satok@google.com> Mon Sep 05 17:54:01 2011 +0900
tree c3351afd7924199036268e775c519393e0e83229
parent 59b501a05078e5a9de7cdace19c51ca693076a17

Support automatic language

Bug: 5057886

Change-Id: I807776b0a3d1286c66ba032c3701b3503911664c

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() {