[Issue 2160728] Fixing full name update when parts of structured name are deleted

Change-Id: I3a206a4cfb09be590bf96476d128791129263742

1 files changed, 26 insertions, 0 deletions

diff --git a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
index 5873f207..295e7235 100644
--- a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
+++ b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
@@ -643,6 +643,32 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test {
         assertStoredValue(uri, Contacts.DISPLAY_NAME, "James Sullivan");
     }
 
+    public void testDisplayNameUpdateFromStructuredNameUpdate() {
+        long rawContactId = createRawContact();
+        Uri nameUri = insertStructuredName(rawContactId, "Slinky", "Dog");
+
+        long contactId = queryContactId(rawContactId);
+
+        Uri uri = ContentUris.withAppendedId(Contacts.CONTENT_URI, contactId);
+        assertStoredValue(uri, Contacts.DISPLAY_NAME, "Slinky Dog");
+
+        ContentValues values = new ContentValues();
+        values.putNull(StructuredName.FAMILY_NAME);
+
+        mResolver.update(nameUri, values, null, null);
+        assertStoredValue(uri, Contacts.DISPLAY_NAME, "Slinky");
+
+        values.putNull(StructuredName.GIVEN_NAME);
+
+        mResolver.update(nameUri, values, null, null);
+        assertStoredValue(uri, Contacts.DISPLAY_NAME, null);
+
+        values.put(StructuredName.FAMILY_NAME, "Dog");
+        mResolver.update(nameUri, values, null, null);
+
+        assertStoredValue(uri, Contacts.DISPLAY_NAME, "Dog");
+    }
+
     public void testSendToVoicemailDefault() {
         long rawContactId = createRawContactWithName();
         long contactId = queryContactId(rawContactId);