Fix failing tests due to logic changes in the new aggregator.

1. All the raw contacts with same name and no data will group together,
so we need to assign different names in this test.
2. We don't have split step anymore, so there is no unpin operation.
3. Fix Long comparison in the aggregator.

Bug:22566083
Change-Id: I1a963bf17866e7569012e4cceca034e7c8312aa3

2 files changed, 1 insertions, 3 deletions

diff --git a/src/com/android/providers/contacts/aggregation/AbstractContactAggregator.java b/src/com/android/providers/contacts/aggregation/AbstractContactAggregator.java
index c18c1d6..5895f51 100644
--- a/src/com/android/providers/contacts/aggregation/AbstractContactAggregator.java
+++ b/src/com/android/providers/contacts/aggregation/AbstractContactAggregator.java
@@ -867,8 +867,6 @@ public abstract class AbstractContactAggregator {
             contactId = mContactInsert.executeInsert();
         }
         for (Long rawContactId : rawContactIds) {
-            // Regrouped contacts should automatically be unpinned.
-            unpinRawContact(rawContactId);
             setContactIdAndMarkAggregated(rawContactId, contactId);
             setPresenceContactId(rawContactId, contactId);
         }
diff --git a/src/com/android/providers/contacts/aggregation/ContactAggregator2.java b/src/com/android/providers/contacts/aggregation/ContactAggregator2.java
index 9beb6c2..5372bbd 100644
--- a/src/com/android/providers/contacts/aggregation/ContactAggregator2.java
+++ b/src/com/android/providers/contacts/aggregation/ContactAggregator2.java
@@ -340,7 +340,7 @@ public class ContactAggregator2 extends AbstractContactAggregator {
                     contactId = currentCidForRawContact;
                     for (Long connectedRawContactId : connectedRawContactIds) {
                         Long cid = matchingCandidates.getContactId(connectedRawContactId);
-                        if (cid != null && cid != contactId) {
+                        if (cid != null && !cid.equals(contactId)) {
                             cidsNeedToBeUpdated.add(cid);
                         }
                     }