commit 221d37d754d8bc6132cd23a694489901f80dfa9d
author Satoshi Kataoka <satok@google.com> Tue May 07 00:28:14 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue May 07 00:28:14 2013 -0700
tree 42ba86144e52dfce86baaac6b93749e0bf95cc0b
parent c8dcf48e022f7964015807dd7d52905ce41bdbfb
parent d430c92deb2434040a6eede58601b5ab6a26f3fe

am d430c92d: Merge "Fix exact match profanity"

* commit 'd430c92deb2434040a6eede58601b5ab6a26f3fe':
  Fix exact match profanity

native/jni/src/suggest/core/suggest.cpp

diff --git a/native/jni/src/suggest/core/suggest.cpp b/native/jni/src/suggest/core/suggest.cpp
index 3221dee..a187948 100644
--- a/native/jni/src/suggest/core/suggest.cpp
+++ b/native/jni/src/suggest/core/suggest.cpp
@@ -163,9 +163,14 @@
                 terminalDicNode->getFlags(), terminalDicNode->getAttributesPos());
         const bool isPossiblyOffensiveWord = terminalDicNode->getProbability() <= 0;
         const bool isExactMatch = terminalDicNode->isExactMatch();
+        const bool isFirstCharUppercase = terminalDicNode->isFirstCharUppercase();
+        // Heuristic: We exclude freq=0 first-char-uppercase words from exact match.
+        // (e.g. "AMD" and "and")
+        const bool isSafeExactMatch = isExactMatch
+                && !(isPossiblyOffensiveWord && isFirstCharUppercase);
         const int outputTypeFlags =
-                isPossiblyOffensiveWord ? Dictionary::KIND_FLAG_POSSIBLY_OFFENSIVE : 0
-                | isExactMatch ? Dictionary::KIND_FLAG_EXACT_MATCH : 0;
+                (isPossiblyOffensiveWord ? Dictionary::KIND_FLAG_POSSIBLY_OFFENSIVE : 0)
+                | (isSafeExactMatch ? Dictionary::KIND_FLAG_EXACT_MATCH : 0);
 
         // Entries that are blacklisted or do not represent a word should not be output.
         const bool isValidWord = !terminalAttributes.isBlacklistedOrNotAWord();