Fix broken aggregation behavior for pinned contacts and tests

Update the value of some pre-defined constants in tests
Make sure that aggregation correctly sets pinned positions for
aggregated contacts - the lowest pinned position of all constituent
raw contacts, and 0 if none of them are pinned.

Bug: 16628573
Change-Id: I3e072baf7ff933a6eef861ed394f3fc817aee48b

1 files changed, 9 insertions, 4 deletions

diff --git a/src/com/android/providers/contacts/aggregation/ContactAggregator.java b/src/com/android/providers/contacts/aggregation/ContactAggregator.java
index 88369f9..390871c 100644
--- a/src/com/android/providers/contacts/aggregation/ContactAggregator.java
+++ b/src/com/android/providers/contacts/aggregation/ContactAggregator.java
@@ -337,10 +337,11 @@ public class ContactAggregator {
                 + RawContacts.STARRED + "=1)" + " WHERE " + Contacts._ID + "=?");
 
         mPinnedUpdate = db.compileStatement("UPDATE " + Tables.CONTACTS + " SET "
-                + Contacts.PINNED + "=(SELECT MIN(" + RawContacts.PINNED + ") FROM "
+                + Contacts.PINNED + " = IFNULL((SELECT MIN(" + RawContacts.PINNED + ") FROM "
                 + Tables.RAW_CONTACTS + " WHERE " + RawContacts.CONTACT_ID + "="
                 + ContactsColumns.CONCRETE_ID + " AND " + RawContacts.PINNED + ">"
-                + PinnedPositions.DEMOTED + ") WHERE " + Contacts._ID + "=?");
+                + PinnedPositions.UNPINNED + ")," + PinnedPositions.UNPINNED + ") "
+                + "WHERE " + Contacts._ID + "=?");
 
         mContactIdAndMarkAggregatedUpdate = db.compileStatement(
                 "UPDATE " + Tables.RAW_CONTACTS +
@@ -1857,7 +1858,7 @@ public class ContactAggregator {
         long contactLastTimeContacted = 0;
         int contactTimesContacted = 0;
         int contactStarred = 0;
-        int contactPinned = PinnedPositions.UNPINNED;
+        int contactPinned = Integer.MAX_VALUE;
         int hasPhoneNumber = 0;
         StringBuilder lookupKey = new StringBuilder();
 
@@ -1917,7 +1918,7 @@ public class ContactAggregator {
                     // contactPinned should be the lowest value of its constituent raw contacts,
                     // excluding negative integers
                     final int rawContactPinned = c.getInt(RawContactsQuery.PINNED);
-                    if (rawContactPinned >= 0) {
+                    if (rawContactPinned > PinnedPositions.UNPINNED) {
                         contactPinned = Math.min(contactPinned, rawContactPinned);
                     }
 
@@ -1961,6 +1962,10 @@ public class ContactAggregator {
             c.close();
         }
 
+        if (contactPinned == Integer.MAX_VALUE) {
+            contactPinned = PinnedPositions.UNPINNED;
+        }
+
         statement.bindLong(ContactReplaceSqlStatement.NAME_RAW_CONTACT_ID,
                 mDisplayNameCandidate.rawContactId);