summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-10-10 00:10:29 -0400
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-10-10 00:10:29 -0400
commit083a50a394915b562ad53be9fd8ec7524e3db21c (patch)
treec5698bee3c41644367de2c13c99506505c7703e2 /core/java/android
parentee110be02256b816ac6d863e39cb8b11b8071baa (diff)
parent66693ea208a233993b541784d99f3a8333b7ac69 (diff)
downloadframeworks_base-083a50a394915b562ad53be9fd8ec7524e3db21c.zip
frameworks_base-083a50a394915b562ad53be9fd8ec7524e3db21c.tar.gz
frameworks_base-083a50a394915b562ad53be9fd8ec7524e3db21c.tar.bz2
Merge change I66693ea2 into eclair
* changes: fix sync exponential backoff for expedited syncs
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/content/SyncManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/content/SyncManager.java b/core/java/android/content/SyncManager.java
index 3877f16..9757ef6 100644
--- a/core/java/android/content/SyncManager.java
+++ b/core/java/android/content/SyncManager.java
@@ -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));