aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-11-28 03:05:43 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-28 03:05:43 +0000
commitc9952fa7d089870a17dddb30e56ad7347cb37669 (patch)
tree63cd35877445e24cda51b94bdbd85ad6ce03bf6f /java/src/com/android/inputmethod/latin/DictionaryFacilitator.java
parent4ea7092aa320c3e5962cafd9c451caa98e54b1b6 (diff)
parent063b2e8d7141641dff06093c807e75737a082818 (diff)
downloadlatinime-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/latin/DictionaryFacilitator.java')
-rw-r--r--java/src/com/android/inputmethod/latin/DictionaryFacilitator.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java b/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java
index f2d7a8c3c..e363661eb 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java
+++ b/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java
@@ -264,7 +264,7 @@ public class DictionaryFacilitator {
return mMostProbableDictionaryGroup;
}
- public void switchMostProbableLanguage(final Locale locale) {
+ public void switchMostProbableLanguage(@Nullable final Locale locale) {
if (null == locale) {
// In many cases, there is no locale to a committed word. For example, a typed word
// that is in none of the currently active dictionaries but still does not