From 1bcf32e1b2c8b23c82e5380a5ddcd7a48e7c0a53 Mon Sep 17 00:00:00 2001
From: Marc Blank <mblank@google.com>
Date: Tue, 11 Sep 2012 18:07:41 -0700
Subject: [PATCH] Don't sync at all if 1) upsync and 2) held

Bug: 7148468

Change-Id: I93a7734f274263e09ddef1b5cf7d9d7ea58a17c3
---
 emailsync/src/com/android/emailsync/SyncManager.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/emailsync/src/com/android/emailsync/SyncManager.java b/emailsync/src/com/android/emailsync/SyncManager.java
index fb0e95f75..6d2064f4c 100644
--- a/emailsync/src/com/android/emailsync/SyncManager.java
+++ b/emailsync/src/com/android/emailsync/SyncManager.java
@@ -2077,7 +2077,9 @@ public abstract class SyncManager extends Service implements Runnable {
         synchronized (sSyncLock) {
             AbstractSyncService svc = ssm.mServiceMap.get(mailboxId);
             if (svc == null) {
-                if (reason != SyncManager.SYNC_UPSYNC) {
+                if (ssm.mSyncErrorMap.containsKey(mailboxId) && reason == SyncManager.SYNC_UPSYNC) {
+                    return;
+                } else if (reason != SyncManager.SYNC_UPSYNC) {
                     ssm.mSyncErrorMap.remove(mailboxId);
                 }
                 Mailbox m = Mailbox.restoreMailboxWithId(ssm, mailboxId);