am 083a50a3: Merge change I66693ea2 into eclair

Merge commit '083a50a394915b562ad53be9fd8ec7524e3db21c' into eclair-mr2

* commit '083a50a394915b562ad53be9fd8ec7524e3db21c':
  fix sync exponential backoff for expedited syncs
This commit is contained in:
Fred Quintana
2009-10-09 21:15:55 -07:00
committed by Android Git Automerger

View File

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