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/dictionarypack/UpdateHandler.java | |
| 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/dictionarypack/UpdateHandler.java')
| -rw-r--r-- | java/src/com/android/inputmethod/dictionarypack/UpdateHandler.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/dictionarypack/UpdateHandler.java b/java/src/com/android/inputmethod/dictionarypack/UpdateHandler.java index aeb666704..f05db9dab 100644 --- a/java/src/com/android/inputmethod/dictionarypack/UpdateHandler.java +++ b/java/src/com/android/inputmethod/dictionarypack/UpdateHandler.java @@ -57,7 +57,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.LinkedList; import java.util.List; -import java.util.Locale; import java.util.Set; import java.util.TreeSet; @@ -880,8 +879,8 @@ public final class UpdateHandler { // None of those are expected to happen, but just in case... if (null == notificationIntent || null == notificationManager) return; - final Locale locale = LocaleUtils.constructLocaleFromString(localeString); - final String language = (null == locale ? "" : locale.getDisplayLanguage()); + final String language = (null == localeString) ? "" + : LocaleUtils.constructLocaleFromString(localeString).getDisplayLanguage(); final String titleFormat = context.getString(R.string.dict_available_notification_title); final String notificationTitle = String.format(titleFormat, language); final Notification.Builder builder = new Notification.Builder(context) |