From 12664a7a4d0a17c4c4db33374550f7ff19593be7 Mon Sep 17 00:00:00 2001 From: Fred Quintana Date: Tue, 27 Apr 2010 16:33:19 -0700 Subject: revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority. Change-Id: I0c18ce3b7098e79e2080e401e441ad246b1d6910 http://b/2631221 --- core/java/android/content/SyncManager.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'core/java/android/content/SyncManager.java') diff --git a/core/java/android/content/SyncManager.java b/core/java/android/content/SyncManager.java index 455815f..d0b67cc 100644 --- a/core/java/android/content/SyncManager.java +++ b/core/java/android/content/SyncManager.java @@ -1561,11 +1561,7 @@ public class SyncManager implements OnAccountsUpdateListener { synchronized (mSyncQueue) { nextOpAndRunTime = mSyncQueue.nextOperation(); } - SyncOperation curOp = activeSyncContext.mSyncOperation; - if (nextOpAndRunTime != null - && nextOpAndRunTime.second <= now - && !nextOpAndRunTime.first.account.equals(curOp.account) - && !nextOpAndRunTime.first.authority.equals(curOp.authority)) { + if (nextOpAndRunTime != null && nextOpAndRunTime.second <= now) { Log.d(TAG, "canceling and rescheduling sync because it ran too long: " + activeSyncContext.mSyncOperation); scheduleSyncOperation(new SyncOperation(activeSyncContext.mSyncOperation)); -- cgit v1.1