[Issue 2123926] Adding support for some non-public legacy contact APIs

Change-Id: Ia9644088561939b39fc20343a522fc0a1be53df4

1 files changed, 18 insertions, 1 deletions

diff --git a/tests/src/com/android/providers/contacts/LegacyContactsProviderTest.java b/tests/src/com/android/providers/contacts/LegacyContactsProviderTest.java
index 8b99ae01..61a748bb 100644
--- a/tests/src/com/android/providers/contacts/LegacyContactsProviderTest.java
+++ b/tests/src/com/android/providers/contacts/LegacyContactsProviderTest.java
@@ -171,6 +171,8 @@ public class LegacyContactsProviderTest extends BaseContactsProvider2Test {
 
     public void testPrimaryPhone() {
         ContentValues values = new ContentValues();
+        putContactValuesExceptName(values);
+
         Uri personUri = mResolver.insert(People.CONTENT_URI, values);
         long personId = ContentUris.parseId(personUri);
 
@@ -194,6 +196,11 @@ public class LegacyContactsProviderTest extends BaseContactsProvider2Test {
         values.put(People.DISPLAY_NAME, "12345");
         assertStoredValues(personUri, values);
 
+        values.clear();
+        putContactValuesExceptName(values);
+        values.put(People.PRIMARY_PHONE_ID, ContentUris.parseId(phoneUri1));
+        assertStoredValues(phoneUri2, values);
+
         // Remove the primary phone number
         mResolver.delete(phoneUri1, null, null);
 
@@ -235,6 +242,7 @@ public class LegacyContactsProviderTest extends BaseContactsProvider2Test {
 
     public void testPrimaryEmail() {
         ContentValues values = new ContentValues();
+        putContactValuesExceptName(values);
         Uri personUri = mResolver.insert(People.CONTENT_URI, values);
         long personId = ContentUris.parseId(personUri);
 
@@ -260,6 +268,11 @@ public class LegacyContactsProviderTest extends BaseContactsProvider2Test {
         values.put(People.DISPLAY_NAME, "foo@acme.com");
         assertStoredValues(personUri, values);
 
+        values.clear();
+        putContactValuesExceptName(values);
+        values.put(People.PRIMARY_EMAIL_ID, ContentUris.parseId(emailUri1));
+        assertStoredValues(emailUri2, values);
+
         // Remove the primary email
         mResolver.delete(emailUri1, null, null);
 
@@ -749,8 +762,12 @@ public class LegacyContactsProviderTest extends BaseContactsProvider2Test {
     }
 
     private void putContactValues(ContentValues values) {
-        // Populating only unhidden columns
+        putContactValuesExceptName(values);
         values.put(People.NAME, "Deer Dough");
+    }
+
+    private void putContactValuesExceptName(ContentValues values) {
+        // Populating only unhidden columns
         values.put(People.PHONETIC_NAME, "Dear Doe");
         values.put(People.NOTES, "Cash Cow");
         values.put(People.TIMES_CONTACTED, 3);