aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeisuke Kuroyanagi <ksk@google.com>2014-04-25 06:49:25 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-25 06:49:25 +0000
commit8e9b27caa30ea027dcd03c8d74df7c80699ed587 (patch)
tree503aca237f674d53cd8909cf9381101e770e810c
parentaee379d212f29fab495db9a01cce5752fbcc6703 (diff)
parent1ed248dc2f5baae93c6ad01812dfc97e81e3db32 (diff)
downloadlatinime-8e9b27caa30ea027dcd03c8d74df7c80699ed587.tar.gz
latinime-8e9b27caa30ea027dcd03c8d74df7c80699ed587.tar.xz
latinime-8e9b27caa30ea027dcd03c8d74df7c80699ed587.zip
am 1ed248dc: Merge "Fix: Wrong null check for user history dict."
* commit '1ed248dc2f5baae93c6ad01812dfc97e81e3db32': Fix: Wrong null check for user history dict.
-rw-r--r--java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java
index b75a55f2b..00b9f533c 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java
+++ b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java
@@ -333,7 +333,7 @@ public class DictionaryFacilitatorForSuggest {
// of this method.
public boolean hasInitializedMainDictionary() {
final Dictionary mainDict = mDictionaries.getMainDict();
- return mainDict != null && mainDict.isInitialized();
+ return mainDict != null && mainDict.isInitialized();
}
public boolean hasPersonalizationDictionary() {
@@ -384,7 +384,7 @@ public class DictionaryFacilitatorForSuggest {
final Dictionaries dictionaries = mDictionaries;
final ExpandableBinaryDictionary userHistoryDictionary =
dictionaries.getSubDict(Dictionary.TYPE_USER_HISTORY);
- if (userHistoryDictionary != null) {
+ if (userHistoryDictionary == null) {
return;
}
final int maxFreq = getMaxFrequency(suggestion);