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

* commit '5caaf1b9e9720d0d3d461623a34dfe797a4095d0':
  Do not add profanity to user history bigram dicitonary

1 files changed, 3 insertions, 2 deletions

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index bfdc1e3c5..1f2982aed 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -2089,10 +2089,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;