diff options
| author | Marc Blank <mblank@google.com> | 2012-09-11 18:07:41 -0700 |
|---|---|---|
| committer | Marc Blank <mblank@google.com> | 2012-09-11 18:07:55 -0700 |
| commit | 1bcf32e1b2c8b23c82e5380a5ddcd7a48e7c0a53 (patch) | |
| tree | c4e284f646a2b1589f72e4e98e4bd87402cf9db6 /emailsync/src | |
| parent | a1464d13a9c0905936ea4487f5a8410c500a99c4 (diff) | |
| download | android_packages_apps_Email-1bcf32e1b2c8b23c82e5380a5ddcd7a48e7c0a53.tar.gz android_packages_apps_Email-1bcf32e1b2c8b23c82e5380a5ddcd7a48e7c0a53.tar.bz2 android_packages_apps_Email-1bcf32e1b2c8b23c82e5380a5ddcd7a48e7c0a53.zip | |
Don't sync at all if 1) upsync and 2) held
Bug: 7148468
Change-Id: I93a7734f274263e09ddef1b5cf7d9d7ea58a17c3
Diffstat (limited to 'emailsync/src')
| -rw-r--r-- | emailsync/src/com/android/emailsync/SyncManager.java | 4 |
1 files changed, 3 insertions, 1 deletions
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); |