am a5e44bbd: am 083a50a3: Merge change I66693ea2 into eclair

Merge commit 'a5e44bbd3788bae2b38dfb7771cb021f8541fe1f' into eclair-mr2-plus-aosp

* commit 'a5e44bbd3788bae2b38dfb7771cb021f8541fe1f':
  fix sync exponential backoff for expedited syncs
This commit is contained in:
Fred Quintana
2009-10-12 10:24:09 -07:00
committed by Android Git Automerger

View File

@@ -811,7 +811,7 @@ class SyncManager implements OnAccountsUpdateListener {
private long rescheduleWithDelay(SyncOperation syncOperation) { private long rescheduleWithDelay(SyncOperation syncOperation) {
long newDelayInMs; long newDelayInMs;
if (syncOperation.delay == 0) { if (syncOperation.delay <= 0) {
// The initial delay is the jitterized INITIAL_SYNC_RETRY_TIME_IN_MS // The initial delay is the jitterized INITIAL_SYNC_RETRY_TIME_IN_MS
newDelayInMs = jitterize(INITIAL_SYNC_RETRY_TIME_IN_MS, newDelayInMs = jitterize(INITIAL_SYNC_RETRY_TIME_IN_MS,
(long)(INITIAL_SYNC_RETRY_TIME_IN_MS * 1.1)); (long)(INITIAL_SYNC_RETRY_TIME_IN_MS * 1.1));