commit 8dc115b246083b00d40974fd951d9130747af070
author Gary Mai <garymai@google.com> Wed Oct 12 18:02:39 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 12 18:02:40 2016 +0000
tree 3264fd14fea324f5ce623433bc37a490d6afea27
parent b3e609a74b6284addebfee7bf3b1b94edfd88d22
parent ac5bd644bcd2c27294a70774abfa9e24fb3d5c52

Merge "Skip psuedo name mimetype during delta parse" into ub-contactsdialer-h-dev

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;
             }