Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00b92b94 authored by Fred Quintana's avatar Fred Quintana Committed by Android Git Automerger
Browse files

am 9aaf24f2: Merge "revert a change in the SyncManager that caused it to not... 

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

* commit '9aaf24f2':
  revert a change in the SyncManager that caused it to not cancel
parents 725f731c 9aaf24f2

core/java/android/content/SyncManager.java

+1 −5
Original line number Diff line number Diff line
@@ -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));