diff options
| author | Fred Quintana <fredq@google.com> | 2010-04-27 16:33:19 -0700 |
|---|---|---|
| committer | Fred Quintana <fredq@google.com> | 2010-04-27 16:33:19 -0700 |
| commit | 12664a7a4d0a17c4c4db33374550f7ff19593be7 (patch) | |
| tree | 73b0ae25139ca4d5411566fd696cd9313157dff5 /core/java/android | |
| parent | 19681af44b7c7494ae8de28dab8aacc3e9d92390 (diff) | |
| download | frameworks_base-12664a7a4d0a17c4c4db33374550f7ff19593be7.zip frameworks_base-12664a7a4d0a17c4c4db33374550f7ff19593be7.tar.gz frameworks_base-12664a7a4d0a17c4c4db33374550f7ff19593be7.tar.bz2 | |
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
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/content/SyncManager.java | 6 |
1 files changed, 1 insertions, 5 deletions
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)); |