Fixing the "Liza Ma" use case. This name was parsed as Liza (first name), M.A. (suffix).

Should really be Liza (first name), Ma (last name)

1 files changed, 7 insertions, 1 deletions

diff --git a/src/com/android/providers/contacts/NameSplitter.java b/src/com/android/providers/contacts/NameSplitter.java
index aad3bc5..54d8a6e 100644
--- a/src/com/android/providers/contacts/NameSplitter.java
+++ b/src/com/android/providers/contacts/NameSplitter.java
@@ -163,7 +163,13 @@ public class NameSplitter {
 
         NameTokenizer tokens = new NameTokenizer(fullName);
         parsePrefix(name, tokens);
-        parseSuffix(name, tokens);
+
+        // If the name consists of just one or two tokens, treat them as first/last name,
+        // not as suffix.  Example: John Ma; Ma is last name, not "M.A.".
+        if (tokens.mEndPointer > 2) {
+            parseSuffix(name, tokens);
+        }
+
         parseLastName(name, tokens);
         parseMiddleName(name, tokens);
         parseGivenNames(name, tokens);