commit 1c6905d2f799d81d5cb847c44fca7dc7d36fd684
author Yorke Lee <yorkelee@google.com> Thu Sep 04 16:06:23 2014 -0700
committer Yorke Lee <yorkelee@google.com> Thu Sep 04 16:06:23 2014 -0700
tree 14ccc34f4b1db2acd3738fe84482a986b35a73e1
parent 0c8a0c43bb95892b513a8aa6005968d53834e486

Follow ContactsContract API changes

Bug: 17390425
Change-Id: Ia88fb0235a56becc3ec5a770067856311769a68c

src/com/android/providers/contacts/ContactsProvider2.java

diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index a558923..1ef07bd 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -6444,7 +6444,7 @@
                 query(db, qb, projection, selection, selectionArgs, localizedSortOrder, groupBy,
                 having, limit, cancellationSignal);
 
-        if (readBooleanQueryParameter(uri, Contacts.ADDRESS_BOOK_INDEX_EXTRAS, false)) {
+        if (readBooleanQueryParameter(uri, Contacts.EXTRA_ADDRESS_BOOK_INDEX, false)) {
             bundleFastScrollingIndexExtras(cursor, uri, db, qb, selection,
                     selectionArgs, sortOrder, addressBookIndexerCountExpression,
                     cancellationSignal);

tests/src/com/android/providers/contacts/ContactsProvider2Test.java

diff --git a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
index 148fdd0..0145fef 100644
--- a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
+++ b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
@@ -7113,7 +7113,7 @@
 
     public void testContactCounts() {
         Uri uri = Contacts.CONTENT_URI.buildUpon()
-                .appendQueryParameter(Contacts.ADDRESS_BOOK_INDEX_EXTRAS, "true").build();
+                .appendQueryParameter(Contacts.EXTRA_ADDRESS_BOOK_INDEX, "true").build();
 
         RawContactUtil.createRawContact(mResolver);
         RawContactUtil.createRawContactWithName(mResolver, "James", "Sullivan");