diff options
| author | Matthew Williams <mjwilliams@google.com> | 2014-03-24 14:42:06 -0700 |
|---|---|---|
| committer | Matthew Williams <mjwilliams@google.com> | 2014-03-24 14:42:06 -0700 |
| commit | bb87ac7f9733ca9b490cb34e8a675dba083a57b7 (patch) | |
| tree | 1dafdaf3def68c809f7831fecbe86c8330dc2ceb /services/java/com/android/server/content/SyncManager.java | |
| parent | c41853cee89b391cd2d4d93205ea69c746ccfa4c (diff) | |
| download | frameworks_base-bb87ac7f9733ca9b490cb34e8a675dba083a57b7.zip frameworks_base-bb87ac7f9733ca9b490cb34e8a675dba083a57b7.tar.gz frameworks_base-bb87ac7f9733ca9b490cb34e8a675dba083a57b7.tar.bz2 | |
DO NOT MERGE: Downgrade expedited to normal on reschedule.
bug: 12033540
Expedited was previously tracked by a redundant internal variable, ostensibly
as an optimisation. This variable could differ from the value in the bundle
depending on how the operation is initialised, which led to confusion. Now an
expedited sync will only be treated as such on its first execution.
Change-Id: Ibfc4e9e49b86c82f2364a6ef55f887705a053eb6
Diffstat (limited to 'services/java/com/android/server/content/SyncManager.java')
| -rw-r--r-- | services/java/com/android/server/content/SyncManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/content/SyncManager.java b/services/java/com/android/server/content/SyncManager.java index 71d8d99..9e3dad6 100644 --- a/services/java/com/android/server/content/SyncManager.java +++ b/services/java/com/android/server/content/SyncManager.java @@ -2352,7 +2352,7 @@ public class SyncManager { Log.v(TAG, "canceling and rescheduling sync since an initialization " + "takes higher priority, " + conflict); } - } else if (candidate.expedited && !conflict.mSyncOperation.expedited + } else if (candidate.isExpedited() && !conflict.mSyncOperation.isExpedited() && (candidateIsInitialization == conflict.mSyncOperation.isInitialization())) { toReschedule = conflict; |