commit 07911ec2569dd3568109d896ed951dba36d375c0
author Marc Blank <mblank@google.com> Wed Oct 27 09:00:16 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 27 09:00:16 2010 -0700
tree dda93527fe889ca66ab396d93d74c2f82ec4e4e4
parent a8e7abec6a749dac35e5d83f1d0952a818ec73be
parent cd020abdfc6a60d041d62d8348e9c4ead7780bd4

Merge "Only callback with sync error if sync was a service request"

src/com/android/exchange/EasSyncService.java

diff --git a/src/com/android/exchange/EasSyncService.java b/src/com/android/exchange/EasSyncService.java
index a541ab0..cd24535 100644
--- a/src/com/android/exchange/EasSyncService.java
+++ b/src/com/android/exchange/EasSyncService.java
@@ -2363,10 +2363,14 @@
                 status = EmailServiceStatus.SUCCESS;
             }
 
-            try {
-                ExchangeService.callback().syncMailboxStatus(mMailboxId, status, 0);
-            } catch (RemoteException e1) {
-                // Don't care if this fails
+            // Send a callback if this run was initiated by a service call
+            if (mSyncReason == ExchangeService.SYNC_SERVICE_START_SYNC ||
+                    mSyncReason == ExchangeService.SYNC_SERVICE_PART_REQUEST) {
+                try {
+                    ExchangeService.callback().syncMailboxStatus(mMailboxId, status, 0);
+                } catch (RemoteException e1) {
+                    // Don't care if this fails
+                }
             }
 
             // Make sure ExchangeService knows about this