Use correct backReferenceIndex in postal addresses

DO NOT MERGE.

Bug: 4167593
Change-Id: Ia656336a78e7424d7055a1c22b54fa8d13adc461

2 files changed, 3 insertions, 4 deletions

diff --git a/java/com/android/vcard/VCardEntry.java b/java/com/android/vcard/VCardEntry.java
index 32391e3..689c48f 100644
--- a/java/com/android/vcard/VCardEntry.java
+++ b/java/com/android/vcard/VCardEntry.java
@@ -1291,9 +1291,8 @@ public class VCardEntry {
         if (mPostalList != null) {
             for (PostalData postalData : mPostalList) {
                 builder = ContentProviderOperation.newInsert(Data.CONTENT_URI);
-                builder.withValueBackReference(Event.RAW_CONTACT_ID, backReferenceIndex);
                 VCardUtils.insertStructuredPostalDataUsingContactsStruct(
-                        mVCardType, builder, postalData);
+                        mVCardType, builder, postalData, backReferenceIndex);
                 operationList.add(builder.build());
             }
         }
diff --git a/java/com/android/vcard/VCardUtils.java b/java/com/android/vcard/VCardUtils.java
index 5385cbf..9e7b8eb 100644
--- a/java/com/android/vcard/VCardUtils.java
+++ b/java/com/android/vcard/VCardUtils.java
@@ -336,8 +336,8 @@ public class VCardUtils {
      */
     public static void insertStructuredPostalDataUsingContactsStruct(int vcardType,
             final ContentProviderOperation.Builder builder,
-            final VCardEntry.PostalData postalData) {
-        builder.withValueBackReference(StructuredPostal.RAW_CONTACT_ID, 0);
+            final VCardEntry.PostalData postalData, int backReferenceIndex) {
+        builder.withValueBackReference(StructuredPostal.RAW_CONTACT_ID, backReferenceIndex);
         builder.withValue(Data.MIMETYPE, StructuredPostal.CONTENT_ITEM_TYPE);
 
         builder.withValue(StructuredPostal.TYPE, postalData.type);