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

Merge "Restrict range of sync job ids" into nyc-dev

Browse Source
This commit is contained in:
Shreyas Basarge
2016-03-10 00:14:28 +00:00
committed by Android (Google) Code Review
parent 3d2e374e70 fa27253c2e
commit 33d693ac59
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/content/SyncManager.java
View File

@@ -192,6 +192,13 @@ public class SyncManager {
*/
private static final long SYNC_DELAY_ON_CONFLICT = 10*1000; // 10 seconds
/**
* Generate job ids in the range [MIN_SYNC_JOB_ID, MAX_SYNC_JOB_ID) to avoid conflicts with
* other jobs scheduled by the system process.
*/
private static final int MIN_SYNC_JOB_ID = 100000;
private static final int MAX_SYNC_JOB_ID = 110000;
private static final String SYNC_WAKE_LOCK_PREFIX = "*sync*/";
private static final String HANDLE_SYNC_ALARM_WAKE_LOCK = "SyncManagerHandleSyncAlarm";
private static final String SYNC_LOOP_WAKE_LOCK = "SyncLoopWakeLock";
@@ -249,7 +256,7 @@ public class SyncManager {
synchronized (mScheduledSyncs) {
int newJobId;
do {
newJobId = mRand.nextInt(Integer.MAX_VALUE);
newJobId = MIN_SYNC_JOB_ID + mRand.nextInt(MAX_SYNC_JOB_ID - MIN_SYNC_JOB_ID);
} while (isJobIdInUseLockedH(newJobId));
return newJobId;
}