Merge "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." into froyo

1 files changed, 1 insertions, 5 deletions

diff --git a/core/java/android/content/SyncManager.java b/core/java/android/content/SyncManager.java
index 455815f39d89..d0b67cca417a 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));