commit 3f8351e18614c71ac217057ae5ec2baeb3e559fa
author Tadashi G. Takaoka <takaoka@google.com> Mon Sep 05 03:56:37 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 05 03:56:37 2011 -0700
tree c6f1d8ae2aefc022f455e849d91b8ffad08f3ea0
parent 6a9f0db202749724373fcd525564e84e1cea3ce9
parent 9676038b6e9fb66760588d7f9c9c642cc493dd71

Merge "Introduce maxMoreSuggestionsRow and minMoreSuggetionsWidth attributes to SuggestionsView"

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