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

Commit 4ede3a30 authored by kaiyiz's avatar kaiyiz Committed by Steve Kondik
Browse files

Contacts: Join the current contact with the selected contact 

Aggregation exceptions in database are not updated completely
when the user try to join the current contact with the selected
contact.

When join the current contact with the selected contact, we should
update all the aggregation exceptions for each pair of raw contacts.

CRs-Fixed: 542577

Change-Id: If5388bc2a5c3b63b54286084e228be47e1c2bcd3
parent e3484649

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

+5 −2
Original line number Diff line number Diff line
@@ -157,8 +157,11 @@ public class RawContactDeltaList extends ArrayList<RawContactDelta> implements P 
                for (Long joinedRawContactId : mJoinWithRawContactIds) {

                    final Builder builder = beginKeepTogether();

                    builder.withValue(AggregationExceptions.RAW_CONTACT_ID1, joinedRawContactId);

                    if (rawContactId != -1) {

                        builder.withValue(AggregationExceptions.RAW_CONTACT_ID2, rawContactId);

                    // we should use each delta's raw contact id, so we can update all the

                    // aggregation exceptions for each pair of raw contacts.

                    if (delta.getRawContactId() != -1) {

                        builder.withValue(AggregationExceptions.RAW_CONTACT_ID2,

                                delta.getRawContactId());

                    } else {

                        builder.withValueBackReference(

                                AggregationExceptions.RAW_CONTACT_ID2, firstBatch);