Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bd82f69 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

When reparenting, prefer GROUP_ROW_ID but allow fallback. 

When a GROUP_SOURCE_ID is the only value provided, usually
while a sync is still going on, allow it to remain when a
valid ROW_ID is present.  Fixes http://b/2222283
parent 7f9ca285

src/com/android/contacts/model/EntityDelta.java

+6 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.provider.BaseColumns; 
import android.provider.ContactsContract;

import android.provider.ContactsContract.Data;

import android.provider.ContactsContract.RawContacts;

import android.provider.ContactsContract.CommonDataKinds.GroupMembership;

import android.util.Log;

import android.view.View;
@@ -695,7 +696,11 @@ public class EntityDelta implements Parcelable { 
            if (mAfter != null) {

                values.putAll(mAfter);

            }

            values.remove(ContactsContract.CommonDataKinds.GroupMembership.GROUP_SOURCE_ID);

            if (values.containsKey(GroupMembership.GROUP_ROW_ID)) {

                // Clear to avoid double-definitions, and prefer rows

                values.remove(GroupMembership.GROUP_SOURCE_ID);

            }



            return values;

        }