diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-11-28 03:05:43 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-11-28 03:05:43 +0000 |
| commit | c9952fa7d089870a17dddb30e56ad7347cb37669 (patch) | |
| tree | 63cd35877445e24cda51b94bdbd85ad6ce03bf6f /java/src/com/android/inputmethod/compat | |
| parent | 4ea7092aa320c3e5962cafd9c451caa98e54b1b6 (diff) | |
| parent | 063b2e8d7141641dff06093c807e75737a082818 (diff) | |
| download | latinime-c9952fa7d089870a17dddb30e56ad7347cb37669.tar.gz latinime-c9952fa7d089870a17dddb30e56ad7347cb37669.tar.xz latinime-c9952fa7d089870a17dddb30e56ad7347cb37669.zip | |
am 063b2e8d: Merge "Make LocaleUtils.constructLocaleFromString as @Nonnull"
* commit '063b2e8d7141641dff06093c807e75737a082818':
Make LocaleUtils.constructLocaleFromString as @Nonnull
Diffstat (limited to 'java/src/com/android/inputmethod/compat')
| -rw-r--r-- | java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java b/java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java index be0744393..c38ea0037 100644 --- a/java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java +++ b/java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java @@ -118,11 +118,7 @@ public final class SuggestionSpanUtils { if (TextUtils.isEmpty(localeString)) { continue; } - final Locale locale = LocaleUtils.constructLocaleFromString(localeString); - if (locale == null) { - continue; - } - return locale; + return LocaleUtils.constructLocaleFromString(localeString); } return null; } |