am d9c702d2: am 5caaf1b9: Merge "Do not add profanity to user history bigram dicitonary" into jb-dev

* commit 'd9c702d2ff017452f0264f2be12b6bffd6204e4a':
  Do not add profanity to user history bigram dicitonary
This commit is contained in:
Satoshi Kataoka 2012-06-14 10:33:47 -07:00 committed by Android Git Automerger
commit d2f210dbe2

View file

@ -1981,10 +1981,11 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
} else {
secondWord = suggestion.toString();
}
// We demote unrecognized word and words with 0-frequency (assuming they would be
// profanity etc.) by specifying them as "invalid".
// We demote unrecognized words (frequency < 0, below) by specifying them as "invalid".
// We don't add words with 0-frequency (assuming they would be profanity etc.).
final int maxFreq = AutoCorrection.getMaxFrequency(
mSuggest.getUnigramDictionaries(), suggestion);
if (maxFreq == 0) return null;
mUserHistoryDictionary.addToUserHistory(null == prevWord ? null : prevWord.toString(),
secondWord, maxFreq > 0);
return prevWord;