am 9aaf24f2: 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
Merge commit '9aaf24f2a46eacd1e342f8c0300c3093646e2814' into froyo-plus-aosp
* commit '9aaf24f2a46eacd1e342f8c0300c3093646e2814':
revert a change in the SyncManager that caused it to not cancel
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 @@
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));