Update addresBookIndexer when removing dupes

Callable contacts allowed for removing duplicates but didn't update the
addressBookIndexerCountExpression to take account for the offset.

Change-Id: I92a40e3adc1a0824e44224fc50d0faeca66dec48
Tickets: CD-99

1 files changed, 6 insertions, 0 deletions

diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index bd7be62..86f6213 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -5860,6 +5860,12 @@ public class ContactsProvider2 extends AbstractContactsProvider
                         uri, ContactsContract.REMOVE_DUPLICATE_ENTRIES, false);
                 if (removeDuplicates) {
                     groupBy = RawContacts.CONTACT_ID;
+
+                    // In this case, because we dedupe phone numbers, the address book indexer needs
+                    // to take it into account too.  (Otherwise headers will appear in wrong
+                    // positions.)
+                    // So use count(distinct CONTACT_ID) instead of count(*).
+                    addressBookIndexerCountExpression = "DISTINCT " + RawContacts.CONTACT_ID;
                 }
                 break;
             }