diff options
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/content/SyncManager.java | 2 | ||||
| -rw-r--r-- | core/java/android/content/SyncOperation.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/content/SyncManager.java b/core/java/android/content/SyncManager.java index 393bbba17e1d..211a2aeda5c6 100644 --- a/core/java/android/content/SyncManager.java +++ b/core/java/android/content/SyncManager.java @@ -819,7 +819,7 @@ public class SyncManager implements OnAccountsUpdateListener { } scheduleSyncOperation(new SyncOperation(operation.account, operation.syncSource, operation.authority, operation.extras, - DELAY_RETRY_SYNC_IN_PROGRESS_IN_SECONDS)); + DELAY_RETRY_SYNC_IN_PROGRESS_IN_SECONDS * 1000)); } else if (syncResult.hasSoftError()) { if (isLoggable) { Log.d(TAG, "retrying sync operation because it encountered a soft error: " diff --git a/core/java/android/content/SyncOperation.java b/core/java/android/content/SyncOperation.java index 4599165b1370..3b3f9c159b5b 100644 --- a/core/java/android/content/SyncOperation.java +++ b/core/java/android/content/SyncOperation.java @@ -19,7 +19,7 @@ public class SyncOperation implements Comparable { public SyncStorageEngine.PendingOperation pendingOperation; public SyncOperation(Account account, int source, String authority, Bundle extras, - long delay) { + long delayInMs) { this.account = account; this.syncSource = source; this.authority = authority; @@ -33,12 +33,12 @@ public class SyncOperation implements Comparable { removeFalseExtra(ContentResolver.SYNC_EXTRAS_EXPEDITED); removeFalseExtra(ContentResolver.SYNC_EXTRAS_OVERRIDE_TOO_MANY_DELETIONS); final long now = SystemClock.elapsedRealtime(); - if (delay < 0) { + if (delayInMs < 0) { this.expedited = true; this.earliestRunTime = now; } else { this.expedited = false; - this.earliestRunTime = now + delay; + this.earliestRunTime = now + delayInMs; } this.key = toKey(); } |