summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/com/android/providers/media/photopicker/sync/PickerSyncManager.java4
-rw-r--r--tests/src/com/android/providers/media/photopicker/sync/PickerSyncManagerTest.java4
2 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/providers/media/photopicker/sync/PickerSyncManager.java b/src/com/android/providers/media/photopicker/sync/PickerSyncManager.java
index 5bfb25de7..8f9951e03 100644
--- a/src/com/android/providers/media/photopicker/sync/PickerSyncManager.java
+++ b/src/com/android/providers/media/photopicker/sync/PickerSyncManager.java
@@ -88,6 +88,7 @@ public class PickerSyncManager {
static final String SYNC_WORKER_INPUT_RESET_TYPE = "INPUT_RESET_TYPE";
static final String SYNC_WORKER_INPUT_ALBUM_ID = "INPUT_ALBUM_ID";
static final String SYNC_WORKER_TAG_IS_PERIODIC = "PERIODIC";
+ static final long PROACTIVE_SYNC_DELAY_MS = 1500;
private static final int SYNC_MEDIA_PERIODIC_WORK_INTERVAL = 4; // Time unit is hours.
private static final int RESET_ALBUM_MEDIA_PERIODIC_WORK_INTERVAL = 12; // Time unit is hours.
@@ -273,7 +274,7 @@ public class PickerSyncManager {
// requests in
// order to avoid adding latency to critical MP code paths.
- mWorkManager.enqueueUniqueWork(workName, ExistingWorkPolicy.KEEP, syncRequest);
+ mWorkManager.enqueueUniqueWork(workName, ExistingWorkPolicy.REPLACE, syncRequest);
}
/**
@@ -410,6 +411,7 @@ public class PickerSyncManager {
return new OneTimeWorkRequest.Builder(ProactiveSyncWorker.class)
.setInputData(inputData)
.setConstraints(constraints)
+ .setInitialDelay(PROACTIVE_SYNC_DELAY_MS, TimeUnit.MILLISECONDS)
.build();
}
diff --git a/tests/src/com/android/providers/media/photopicker/sync/PickerSyncManagerTest.java b/tests/src/com/android/providers/media/photopicker/sync/PickerSyncManagerTest.java
index b450e6c59..78779d8af 100644
--- a/tests/src/com/android/providers/media/photopicker/sync/PickerSyncManagerTest.java
+++ b/tests/src/com/android/providers/media/photopicker/sync/PickerSyncManagerTest.java
@@ -230,6 +230,8 @@ public class PickerSyncManagerTest {
assertThat(workRequest.getWorkSpec().input
.getInt(SYNC_WORKER_INPUT_SYNC_SOURCE, -1))
.isEqualTo(SYNC_LOCAL_ONLY);
+ assertThat(workRequest.getWorkSpec().initialDelay)
+ .isEqualTo(PickerSyncManager.PROACTIVE_SYNC_DELAY_MS);
}
@Test
@@ -254,6 +256,8 @@ public class PickerSyncManagerTest {
assertThat(workRequest.getWorkSpec().input
.getInt(SYNC_WORKER_INPUT_SYNC_SOURCE, -1))
.isEqualTo(SYNC_LOCAL_AND_CLOUD);
+ assertThat(workRequest.getWorkSpec().initialDelay)
+ .isEqualTo(PickerSyncManager.PROACTIVE_SYNC_DELAY_MS);
}
@Test