Don't sync at all if 1) upsync and 2) held
Bug: 7148468 Change-Id: I93a7734f274263e09ddef1b5cf7d9d7ea58a17c3
This commit is contained in:
parent
a1464d13a9
commit
1bcf32e1b2
|
@ -2077,7 +2077,9 @@ public abstract class SyncManager extends Service implements Runnable {
|
||||||
synchronized (sSyncLock) {
|
synchronized (sSyncLock) {
|
||||||
AbstractSyncService svc = ssm.mServiceMap.get(mailboxId);
|
AbstractSyncService svc = ssm.mServiceMap.get(mailboxId);
|
||||||
if (svc == null) {
|
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);
|
ssm.mSyncErrorMap.remove(mailboxId);
|
||||||
}
|
}
|
||||||
Mailbox m = Mailbox.restoreMailboxWithId(ssm, mailboxId);
|
Mailbox m = Mailbox.restoreMailboxWithId(ssm, mailboxId);
|
||||||
|
|
Loading…
Reference in New Issue