drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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 '9aaf24f2a46eacd1e342f8c0300c3093646e2814' into froyo-plus-aosp

* commit '9aaf24f2a46eacd1e342f8c0300c3093646e2814':
  revert a change in the SyncManager that caused it to not cancel
This commit is contained in:
Fred Quintana
2010-04-28 14:13:55 -07:00
committed by Android Git Automerger
parent 725f731cb9 9aaf24f2a4
commit 00b92b943f
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) {
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));