Enhance AbstractGDataSyncAdapter methods for sliding sync.

Add the feedSyncData to updateQueryParameters and updateProvider for the use of
sliding sync code.

This change needs to be submitted in conjunction with the vendor/google/frameworks change.

1 files changed, 5 insertions, 3 deletions

diff --git a/src/com/android/providers/contacts/ContactsSyncAdapter.java b/src/com/android/providers/contacts/ContactsSyncAdapter.java
index cd33590..a1b7334 100644
--- a/src/com/android/providers/contacts/ContactsSyncAdapter.java
+++ b/src/com/android/providers/contacts/ContactsSyncAdapter.java
@@ -659,7 +659,8 @@ public class ContactsSyncAdapter extends AbstractGDataSyncAdapter {
         }
     }
 
-    private static void addPhonesToContactEntry(ContentResolver cr, long personId, ContactEntry entry)
+    private static void addPhonesToContactEntry(ContentResolver cr, long personId,
+                                                ContactEntry entry)
             throws ParseException {
         Cursor c = cr.query(Phones.CONTENT_URI, null, "person=" + personId, null, null);
         int numberIndex = c.getColumnIndexOrThrow(People.Phones.NUMBER);
@@ -838,7 +839,8 @@ public class ContactsSyncAdapter extends AbstractGDataSyncAdapter {
      * actions on the ContentProvider to represent the entry.
      */
     protected void updateProvider(Feed feed, Long syncLocalId,
-            Entry baseEntry, ContentProvider provider, Object syncInfo) throws ParseException {
+            Entry baseEntry, ContentProvider provider, Object syncInfo,
+            GDataSyncData.FeedData feedSyncData) throws ParseException {
 
         // This is a hack to delete these incorrectly created contacts named "Starred in Android"
         if (baseEntry instanceof ContactEntry
@@ -1200,7 +1202,7 @@ public class ContactsSyncAdapter extends AbstractGDataSyncAdapter {
     }
 
     @Override
-    protected void updateQueryParameters(QueryParams params) {
+    protected void updateQueryParameters(QueryParams params, GDataSyncData.FeedData feedSyncData) {
         // we want to get the events ordered by last modified, so we can
         // recover in case we cannot process the entire feed.
         params.setParamValue("orderby", "lastmodified");