Merge "Fix: Wrong null check for user history dict."

main
Keisuke Kuroyanagi 2014-04-25 06:48:16 +00:00 committed by Android (Google) Code Review
commit 1ed248dc2f
1 changed files with 2 additions and 2 deletions

View File

@ -333,7 +333,7 @@ public class DictionaryFacilitatorForSuggest {
// of this method. // of this method.
public boolean hasInitializedMainDictionary() { public boolean hasInitializedMainDictionary() {
final Dictionary mainDict = mDictionaries.getMainDict(); final Dictionary mainDict = mDictionaries.getMainDict();
return mainDict != null && mainDict.isInitialized(); return mainDict != null && mainDict.isInitialized();
} }
public boolean hasPersonalizationDictionary() { public boolean hasPersonalizationDictionary() {
@ -384,7 +384,7 @@ public class DictionaryFacilitatorForSuggest {
final Dictionaries dictionaries = mDictionaries; final Dictionaries dictionaries = mDictionaries;
final ExpandableBinaryDictionary userHistoryDictionary = final ExpandableBinaryDictionary userHistoryDictionary =
dictionaries.getSubDict(Dictionary.TYPE_USER_HISTORY); dictionaries.getSubDict(Dictionary.TYPE_USER_HISTORY);
if (userHistoryDictionary != null) { if (userHistoryDictionary == null) {
return; return;
} }
final int maxFreq = getMaxFrequency(suggestion); final int maxFreq = getMaxFrequency(suggestion);