Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5e44bbd authored by Fred Quintana's avatar Fred Quintana Committed by Android Git Automerger
Browse files

am 083a50a3: Merge change I66693ea2 into eclair 

Merge commit '083a50a3' into eclair-mr2

* commit '083a50a3':
  fix sync exponential backoff for expedited syncs
parents 1bb55501 083a50a3

core/java/android/content/SyncManager.java

+1 −1
Original line number Diff line number Diff line
@@ -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));