Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Fred Quintana
2010-04-28 14:10:05 -07:00
committed by Android (Google) Code Review
parent bc5a03286a 12664a7a4d
commit 9aaf24f2a4
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/content/SyncManager.java
View File

@@ -1561,11 +1561,7 @@ public class SyncManager implements OnAccountsUpdateListener {
synchronized (mSyncQueue) { synchronized (mSyncQueue) {
nextOpAndRunTime = mSyncQueue.nextOperation(); nextOpAndRunTime = mSyncQueue.nextOperation();
} }
SyncOperation curOp = activeSyncContext.mSyncOperation; if (nextOpAndRunTime != null && nextOpAndRunTime.second <= now) {
if (nextOpAndRunTime != null
&& nextOpAndRunTime.second <= now
&& !nextOpAndRunTime.first.account.equals(curOp.account)
&& !nextOpAndRunTime.first.authority.equals(curOp.authority)) {
Log.d(TAG, "canceling and rescheduling sync because it ran too long: " Log.d(TAG, "canceling and rescheduling sync because it ran too long: "
+ activeSyncContext.mSyncOperation); + activeSyncContext.mSyncOperation);
scheduleSyncOperation(new SyncOperation(activeSyncContext.mSyncOperation)); scheduleSyncOperation(new SyncOperation(activeSyncContext.mSyncOperation));