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

* commit '1ed248dc2f5baae93c6ad01812dfc97e81e3db32':
  Fix: Wrong null check for user history dict.
main
Keisuke Kuroyanagi 2014-04-25 06:49:25 +00:00 committed by Android Git Automerger
commit 8e9b27caa3
1 changed files with 2 additions and 2 deletions

View File

@ -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);