commit 6146169557f782f0f51fd19f839bdebc6e1fdaab
author Marc Blank <mblank@google.com> Sat Mar 27 10:51:10 2010 -0700
committer Marc Blank <mblank@google.com> Sat Mar 27 10:59:55 2010 -0700
tree e64a6bb8c3f84b957f1bd730bec7797acbf4921e
parent bcde8e627c680401f252e14ccfcedfef555a1ff9

Check for dirty events in specified account before syncing

* We were starting a sync if there was a dirty event in ANY of
  our Exchange accounts
* Change to check for the specific account before syncing; this
  saves provider queries and service (i.e. thread) startups

Bug: 2550620
Change-Id: I83e953f1bade9fa269b777e96121a63664e8edc8

src/com/android/exchange/CalendarSyncAdapterService.java

diff --git a/src/com/android/exchange/CalendarSyncAdapterService.java b/src/com/android/exchange/CalendarSyncAdapterService.java
index d2f4ecf..357d67f 100644
--- a/src/com/android/exchange/CalendarSyncAdapterService.java
+++ b/src/com/android/exchange/CalendarSyncAdapterService.java
@@ -43,6 +43,8 @@
 
     private static final String ACCOUNT_AND_TYPE_CALENDAR =
         MailboxColumns.ACCOUNT_KEY + "=? AND " + MailboxColumns.TYPE + '=' + Mailbox.TYPE_CALENDAR;
+    private static final String DIRTY_IN_ACCOUNT =
+        Events._SYNC_DIRTY + "=1 AND " + Events._SYNC_ACCOUNT + "=?";
 
     public CalendarSyncAdapterService() {
         super();
@@ -93,16 +95,13 @@
             throws OperationCanceledException {
         ContentResolver cr = context.getContentResolver();
         boolean logging = Eas.USER_LOG;
-        if (logging) {
-            Log.d(TAG, "performSync");
-        }
         if (extras.getBoolean(ContentResolver.SYNC_EXTRAS_UPLOAD)) {
             Cursor c = cr.query(Events.CONTENT_URI,
-                    new String[] {Events._ID}, Events._SYNC_DIRTY + "=1", null, null);
+                    new String[] {Events._ID}, DIRTY_IN_ACCOUNT, new String[] {account.name}, null);
             try {
                 if (!c.moveToFirst()) {
                     if (logging) {
-                        Log.d(TAG, "Upload sync; no changes");
+                        Log.d(TAG, "No changes for " + account.name);
                     }
                     return;
                 }
@@ -125,7 +124,7 @@
                 try {
                      if (mailboxCursor.moveToFirst()) {
                         if (logging) {
-                            Log.d(TAG, "Calendar sync requested for " + account.name);
+                            Log.d(TAG, "Upload sync requested for " + account.name);
                         }
                         // Ask for a sync from our sync manager
                         SyncManager.serviceRequest(mailboxCursor.getLong(0),