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

am 00b92b94: 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

Browse Source 
Merge commit '00b92b943ff397cb7f7c4827a0eea9df7aa22071' into kraken

* commit '00b92b943ff397cb7f7c4827a0eea9df7aa22071':
  revert a change in the SyncManager that caused it to not cancel
This commit is contained in:
Fred Quintana
2010-04-28 14:18:19 -07:00
committed by Android Git Automerger
parent 655bf11de1 00b92b943f
commit 2bf0f1a3c1
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));