Don't clear errorMap due to upload sync

* Clearing it will prevent backoff behavior from working
  properly when there are changes to be uploaded

Change-Id: I1a1509e42730a3aa36298e3024068b6fe993e045
This commit is contained in:
Marc Blank 2012-09-10 12:45:53 -07:00
parent d8b2b8aebd
commit 4417adce6d
1 changed files with 4 additions and 2 deletions

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) {
ssm.mSyncErrorMap.remove(mailboxId);
if (reason != SyncManager.SYNC_UPSYNC) {
ssm.mSyncErrorMap.remove(mailboxId);
}
Mailbox m = Mailbox.restoreMailboxWithId(ssm, mailboxId);
if (m != null) {
log("Starting sync for " + m.mDisplayName);
@ -2199,7 +2201,7 @@ public abstract class SyncManager extends Service implements Runnable {
case AbstractSyncService.EXIT_IO_ERROR:
if (syncError != null) {
syncError.escalate();
log(m.mDisplayName + " held for " + syncError.holdDelay + "ms");
log(m.mDisplayName + " held for " + (syncError.holdDelay/ 1000) + "s");
return;
} else {
log(m.mDisplayName + " added to syncErrorMap, hold for 15s");