diff options
| author |   satok <satok@google.com> | 2011-09-05 02:39:58 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2011-09-05 02:39:58 -0700 |
| commit | 6a9f0db202749724373fcd525564e84e1cea3ce9 (patch) | |
| tree | 053309063b790abb1b49b20cd97b1012c9e5519a /java/src/com/android | |
| parent | 1d8ec1cb9fb2c395873566438fe63e46b9e535da (diff) | |
| parent | 0cba0c11f64115933783627a31525cca9a2f32d9 (diff) | |
| download | latinime-6a9f0db202749724373fcd525564e84e1cea3ce9.tar.gz latinime-6a9f0db202749724373fcd525564e84e1cea3ce9.tar.xz latinime-6a9f0db202749724373fcd525564e84e1cea3ce9.zip | |
Merge "Support automatic language"
Diffstat (limited to 'java/src/com/android')
| -rw-r--r-- | java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatWrapper.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatWrapper.java b/java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatWrapper.java index b6b86a4a0..a6bb83adf 100644 --- 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() { |