ADHOC
/
replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Don't sync at all if 1) upsync and 2) held" into jb-ub-mail

This commit is contained in:
Marc Blank 2012-09-11 18:12:15 -07:00 committed by Android (Google) Code Review
parent 885a86c4bf 1bcf32e1b2
commit d14bb10700
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
emailsync/src/com/android/emailsync/SyncManager.java
View File

@ -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);