Fixing ContactAggregator breakage revealed by an automated test

If you have an automatic aggregate of three or more
raw contacts and you confirm the aggregation by adding
an explicit manual override between two of the raw contacts,
the third raw contact falls out of the aggregate.

This CL fixes the problem.

Bug: 3097139
Change-Id: I96b717eeb03e1a49a45b28ee395924f9d61c3e99

1 files changed, 2 insertions, 0 deletions

diff --git a/tests/src/com/android/providers/contacts/ContactAggregatorTest.java b/tests/src/com/android/providers/contacts/ContactAggregatorTest.java
index 6667564..328b03c 100644
--- a/tests/src/com/android/providers/contacts/ContactAggregatorTest.java
+++ b/tests/src/com/android/providers/contacts/ContactAggregatorTest.java
@@ -547,6 +547,8 @@ public class ContactAggregatorTest extends BaseContactsProvider2Test {
         long rawContactId1 = createRawContactWithName("John", "Doe", ACCOUNT_1);
         long rawContactId2 = createRawContactWithName("John", "Doe", ACCOUNT_2);
         long rawContactId3 = createRawContactWithName("John", "Doe", ACCOUNT_3);
+        assertAggregated(rawContactId1, rawContactId2);
+        assertAggregated(rawContactId1, rawContactId3);
         setAggregationException(
                 AggregationExceptions.TYPE_KEEP_TOGETHER, rawContactId1, rawContactId2);
         assertAggregated(rawContactId1, rawContactId2);