commit ac5bd644bcd2c27294a70774abfa9e24fb3d5c52
author Gary Mai <garymai@google.com> Wed Oct 12 10:31:36 2016 -0700
committer Gary Mai <garymai@google.com> Wed Oct 12 10:31:36 2016 -0700
tree 06a441e13f84a946e77af7ce18a2814c6f134077
parent cf2dc067c53cc2b869ce697e7484473ea2894d05

Skip psuedo name mimetype during delta parse

Missed this in ag/1527652, an extra name field was appearing
because of it.

Test:
Hit "more fields" and see no extra name fields.

Bug: 32023197
Bug: 21758689
Change-Id: I8b8f0cd1d8556dd79162a6c723b4bd108d1ed476

src/com/android/contacts/editor/RawContactEditorView.java

diff --git a/src/com/android/contacts/editor/RawContactEditorView.java b/src/com/android/contacts/editor/RawContactEditorView.java
index d3c7535..038a8de 100644
--- a/src/com/android/contacts/editor/RawContactEditorView.java
+++ b/src/com/android/contacts/editor/RawContactEditorView.java
@@ -554,7 +554,8 @@
             final String mimeType = dataKind.mimeType;
 
             // Skip psuedo mime types
-            if (DataKind.PSEUDO_MIME_TYPE_PHONETIC_NAME.equals(mimeType)) {
+            if (DataKind.PSEUDO_MIME_TYPE_NAME.equals(mimeType) ||
+                    DataKind.PSEUDO_MIME_TYPE_PHONETIC_NAME.equals(mimeType)) {
                 vlog("parse: " + i + " " + dataKind.mimeType + " dropped pseudo type");
                 continue;
             }