Fix ItemsProviderTest flakiness
Made the PickerSyncController sync delay configurable so that the
tests can set it to zero to stop sync flakiness.
Also ignored failures notifying the StorageManagerService about
cloud media provider updates
Test: atest --iterations 20 ItemsProviderTest
Bug: 214028962
Change-Id: Ifcf86862c1b5cf7c772053c6ff5ed0271928128c
Merged-In: Ifcf86862c1b5cf7c772053c6ff5ed0271928128c
(cherry picked from commit c42e1044457c931a60cb44e1c1c90e3e1f6c2ecd)
diff --git a/src/com/android/providers/media/photopicker/PickerSyncController.java b/src/com/android/providers/media/photopicker/PickerSyncController.java
index f6a6f28..792a501 100644
--- a/src/com/android/providers/media/photopicker/PickerSyncController.java
+++ b/src/com/android/providers/media/photopicker/PickerSyncController.java
@@ -69,7 +69,8 @@
private static final String DEFAULT_CLOUD_PROVIDER_PKG = null;
private static final int DEFAULT_CLOUD_PROVIDER_UID = -1;
- private static final long DEFAULT_SYNC_DELAY_MS = 1000;
+ private static final long DEFAULT_SYNC_DELAY_MS =
+ PickerDbFacade.getDefaultPickerDbSyncDelayMs();
private static final int SYNC_TYPE_NONE = 0;
private static final int SYNC_TYPE_INCREMENTAL = 1;
diff --git a/src/com/android/providers/media/photopicker/data/PickerDbFacade.java b/src/com/android/providers/media/photopicker/data/PickerDbFacade.java
index 3f9b243..c884518 100644
--- a/src/com/android/providers/media/photopicker/data/PickerDbFacade.java
+++ b/src/com/android/providers/media/photopicker/data/PickerDbFacade.java
@@ -54,6 +54,10 @@
* MediaProvider for the Photo Picker.
*/
public class PickerDbFacade {
+ public static final String PROP_ENABLED = "sys.photopicker.pickerdb.enabled";
+ public static final String PROP_DEFAULT_SYNC_DELAY_MS =
+ "persist.sys.photopicker.pickerdb.default_sync_delay_ms";
+
private final Object mLock = new Object();
private final Context mContext;
private final SQLiteDatabase mDatabase;
@@ -679,7 +683,11 @@
}
public static boolean isPickerDbEnabled() {
- return SystemProperties.getBoolean("sys.photopicker.pickerdb.enabled", true);
+ return SystemProperties.getBoolean(PROP_ENABLED, true);
+ }
+
+ public static int getDefaultPickerDbSyncDelayMs() {
+ return SystemProperties.getInt(PROP_DEFAULT_SYNC_DELAY_MS, 1000);
}
private boolean isLocal(String authority) {
diff --git a/tests/src/com/android/providers/media/photopicker/ItemsProviderTest.java b/tests/src/com/android/providers/media/photopicker/ItemsProviderTest.java
index 49dfaf6..a9eb6bf 100644
--- a/tests/src/com/android/providers/media/photopicker/ItemsProviderTest.java
+++ b/tests/src/com/android/providers/media/photopicker/ItemsProviderTest.java
@@ -18,6 +18,7 @@
import static android.provider.MediaStore.VOLUME_EXTERNAL;
+import static com.android.providers.media.photopicker.data.PickerDbFacade.PROP_DEFAULT_SYNC_DELAY_MS;
import static com.android.providers.media.util.MimeUtils.isImageMimeType;
import static com.android.providers.media.util.MimeUtils.isVideoMimeType;
@@ -25,6 +26,7 @@
import static com.google.common.truth.Truth.assertWithMessage;
import android.Manifest;
+import android.app.UiAutomation;
import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
@@ -70,12 +72,18 @@
@Before
public void setUp() {
- InstrumentationRegistry.getInstrumentation().getUiAutomation()
- .adoptShellPermissionIdentity(Manifest.permission.LOG_COMPAT_CHANGE,
+ final UiAutomation uiAutomation = InstrumentationRegistry.getInstrumentation()
+ .getUiAutomation();
+
+ uiAutomation.adoptShellPermissionIdentity(Manifest.permission.LOG_COMPAT_CHANGE,
Manifest.permission.READ_COMPAT_CHANGE_CONFIG,
Manifest.permission.READ_DEVICE_CONFIG,
Manifest.permission.INTERACT_ACROSS_USERS);
+ // Remove sync delay to avoid flaky tests
+ final String setSyncDelayCommand = "setprop " + PROP_DEFAULT_SYNC_DELAY_MS + " 0";
+ uiAutomation.executeShellCommand(setSyncDelayCommand);
+
final Context context = InstrumentationRegistry.getTargetContext();
final Context isolatedContext
= new IsolatedContext(context, "databases", /*asFuseThread*/ false);
