Save away unknown properties that begin with X-.android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1marshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-release

PBAP sends over call logs using the vcard format and uses
the X-IRMC-DATETIME property to add in the timestamp of
the calls. The current VCardEntry drops entries that are
not recognized, and since these aren't recongized, they
are dropped.

Given that X- properties can be anything, this change saves
them away in a list that the caller can check and parse if
they desire to do so.

Change-Id: Iece345cc5b1f0ac3b7c8fbc29c78cc4deff11b22

1 files changed, 12 insertions, 0 deletions

diff --git a/java/com/android/vcard/VCardEntry.java b/java/com/android/vcard/VCardEntry.java
index 255697b..44a71d8 100644
--- a/java/com/android/vcard/VCardEntry.java
+++ b/java/com/android/vcard/VCardEntry.java
@@ -42,6 +42,7 @@ import android.provider.ContactsContract.RawContacts;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 import android.util.Log;
+import android.util.Pair;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -1552,6 +1553,7 @@ public class VCardEntry {
     private List<AndroidCustomData> mAndroidCustomDataList;
     private BirthdayData mBirthday;
     private AnniversaryData mAnniversary;
+    private List<Pair<String, String>> mUnknownXData;
 
     /**
      * Inner iterator interface.
@@ -2403,6 +2405,12 @@ public class VCardEntry {
             final List<String> customPropertyList = VCardUtils.constructListFromValue(propValue,
                     mVCardType);
             handleAndroidCustomProperty(customPropertyList);
+        } else if (propertyName.toUpperCase().startsWith("X-")) {
+            // Catch all for X- properties. The caller can decide what to do with these.
+            if (mUnknownXData == null) {
+                mUnknownXData = new ArrayList<Pair<String, String>>();
+            }
+            mUnknownXData.add(new Pair<String, String>(propertyName, propValue));
         } else {
         }
         // Be careful when adding some logic here, as some blocks above may use "return".
@@ -2647,4 +2655,8 @@ public class VCardEntry {
         }
         return mNameData.displayName;
     }
+
+    public List<Pair<String, String>> getUnknownXData() {
+        return mUnknownXData;
+    }
 }