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

DO NOT MERGE: Downgrade expedited to normal on reschedule.

Browse Source 
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
This commit is contained in:
Matthew Williams
2014-03-24 14:42:06 -07:00
parent c41853cee8
commit bb87ac7f97
5 changed files with 38 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/content/SyncManager.java
View File

@ -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;

50
services/java/com/android/server/content/SyncOperation.java
View File

@ -66,7 +66,8 @@ public class SyncOperation implements Comparable {
public final boolean allowParallelSyncs;
public Bundle extras;
public final String key;
public boolean expedited;
/** Internal boolean to avoid reading a bundle everytime we want to compare operations. */
private final boolean expedited;
public SyncStorageEngine.PendingOperation pendingOperation;
/** Elapsed real time in millis at which to run this sync. */
public long latestRunTime;
@ -79,7 +80,7 @@ public class SyncOperation implements Comparable {
* Depends on max(backoff, latestRunTime, and delayUntil).
*/
public long effectiveRunTime;
/** Amount of time before {@link effectiveRunTime} from which this sync can run. */
/** Amount of time before {@link #effectiveRunTime} from which this sync can run. */
public long flexTime;
public SyncOperation(Account account, int userId, int reason, int source, String authority,
@ -98,11 +99,16 @@ public class SyncOperation implements Comparable {
this.backoff = backoff;
final long now = SystemClock.elapsedRealtime();
// Checks the extras bundle. Must occur after we set the internal bundle.
if (runTimeFromNow < 0 || isExpedited()) {
if (runTimeFromNow < 0) {
// Sanity check: Will always be true.
if (!this.extras.getBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, false)) {
this.extras.putBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, true);
}
this.expedited = true;
this.latestRunTime = now;
this.flexTime = 0;
} else {
this.extras.remove(ContentResolver.SYNC_EXTRAS_EXPEDITED);
this.expedited = false;
this.latestRunTime = now + runTimeFromNow;
this.flexTime = flexTime;
@ -111,6 +117,24 @@ public class SyncOperation implements Comparable {
this.key = toKey();
}
/** Only used to immediately reschedule a sync. */
SyncOperation(SyncOperation other) {
this.service = other.service;
this.account = other.account;
this.authority = other.authority;
this.userId = other.userId;
this.reason = other.reason;
this.syncSource = other.syncSource;
this.extras = new Bundle(other.extras);
this.expedited = other.expedited;
this.latestRunTime = SystemClock.elapsedRealtime();
this.flexTime = 0L;
this.backoff = other.backoff;
this.allowParallelSyncs = other.allowParallelSyncs;
this.updateEffectiveRunTime();
this.key = toKey();
}
/**
* Make sure the bundle attached to this SyncOperation doesn't have unnecessary
* flags set.
@ -138,24 +162,6 @@ public class SyncOperation implements Comparable {
}
}
/** Only used to immediately reschedule a sync. */
SyncOperation(SyncOperation other) {
this.service = other.service;
this.account = other.account;
this.authority = other.authority;
this.userId = other.userId;
this.reason = other.reason;
this.syncSource = other.syncSource;
this.extras = new Bundle(other.extras);
this.expedited = other.expedited;
this.latestRunTime = SystemClock.elapsedRealtime();
this.flexTime = 0L;
this.backoff = other.backoff;
this.allowParallelSyncs = other.allowParallelSyncs;
this.updateEffectiveRunTime();
this.key = toKey();
}
@Override
public String toString() {
return dump(null, true);
@ -220,7 +226,7 @@ public class SyncOperation implements Comparable {
}
public boolean isExpedited() {
return extras.getBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, false) || expedited;
return expedited;
}
public boolean ignoreBackoff() {

6
services/java/com/android/server/content/SyncQueue.java
View File

@ -73,10 +73,9 @@ public class SyncQueue {
}
SyncOperation syncOperation = new SyncOperation(
op.account, op.userId, op.reason, op.syncSource, op.authority, op.extras,
0 /* delay */, 0 /* flex */, backoff != null ? backoff.first : 0,
op.expedited ? -1: 0 /* delay */, 0 /* flex */, backoff != null ? backoff.first : 0,
mSyncStorageEngine.getDelayUntilTime(op.account, op.userId, op.authority),
syncAdapterInfo.type.allowParallelSyncs());
syncOperation.expedited = op.expedited;
syncOperation.pendingOperation = op;
add(syncOperation, op);
}
@ -104,7 +103,6 @@ public class SyncQueue {
if (existingOperation != null) {
boolean changed = false;
if (operation.compareTo(existingOperation) <= 0 ) {
existingOperation.expedited = operation.expedited;
long newRunTime =
Math.min(existingOperation.latestRunTime, operation.latestRunTime);
// Take smaller runtime.
@ -123,7 +121,7 @@ public class SyncQueue {
if (operation.pendingOperation == null) {
pop = new SyncStorageEngine.PendingOperation(
operation.account, operation.userId, operation.reason, operation.syncSource,
operation.authority, operation.extras, operation.expedited);
operation.authority, operation.extras, operation.isExpedited());
pop = mSyncStorageEngine.insertIntoPending(pop);
if (pop == null) {
throw new IllegalStateException("error adding pending sync operation "

2
services/java/com/android/server/content/SyncStorageEngine.java
View File

@ -501,7 +501,7 @@ public class SyncStorageEngine extends Handler {
* @return amount of seconds before syncTimeSeconds that the sync can occur.
* I.e.
* earliest_sync_time = syncTimeSeconds - calculateDefaultFlexTime(syncTimeSeconds)
* The flex time is capped at a percentage of the {@link DEFAULT_POLL_FREQUENCY_SECONDS}.
* The flex time is capped at a percentage of the {@link #DEFAULT_POLL_FREQUENCY_SECONDS}.
*/
public static long calculateDefaultFlexTime(long syncTimeSeconds) {
if (syncTimeSeconds < DEFAULT_MIN_FLEX_ALLOWED_SECS) {

11
services/tests/servicestests/src/com/android/server/content/SyncOperationTest.java
View File

@ -136,10 +136,11 @@ public class SyncOperationTest extends AndroidTestCase {
"authority1", b1, soon + 100, soonFlex + 100, unimportant, unimportant, true);
assertTrue(op1.compareTo(op2) == -1);
assertTrue("less than not transitive.", op2.compareTo(op1) == 1);
assertTrue(op1.compareTo(op3) == 1);
assertTrue("greater than not transitive. ", op3.compareTo(op1) == -1);
assertTrue("overlapping intervals not the same.", op1.compareTo(op4) == 0);
assertTrue("equality not transitive.", op4.compareTo(op1) == 0);
assertTrue("Less than not transitive.", op2.compareTo(op1) == 1);
assertEquals("Expedited not smaller than non-expedited.", -1, op1.compareTo(op3));
assertEquals("Greater than not transitive for expedited. ", 1, op3.compareTo(op1));
assertTrue("overlapping intervals not compared based on start interval.",
op1.compareTo(op4) == -1);
assertTrue("overlapping interval comparison not transitive.", op4.compareTo(op1) == 1);
}
}