Merge "Propagate cancellation signal for both media sets and media sets content." into main

6 files changed, 37 insertions, 27 deletions

diff --git a/tests/src/com/android/providers/media/photopicker/sync/MediaInMediaSetsSyncWorkerTest.java b/tests/src/com/android/providers/media/photopicker/sync/MediaInMediaSetsSyncWorkerTest.java
index 78ca6fc46..8ea42965e 100644
--- a/tests/src/com/android/providers/media/photopicker/sync/MediaInMediaSetsSyncWorkerTest.java
+++ b/tests/src/com/android/providers/media/photopicker/sync/MediaInMediaSetsSyncWorkerTest.java
@@ -57,6 +57,7 @@ import com.android.providers.media.flags.Flags;
 import com.android.providers.media.photopicker.PickerSyncController;
 import com.android.providers.media.photopicker.data.PickerDatabaseHelper;
 import com.android.providers.media.photopicker.data.PickerDbFacade;
+import com.android.providers.media.photopicker.util.exceptions.RequestObsoleteException;
 import com.android.providers.media.photopicker.v2.model.MediaSetsSyncRequestParams;
 import com.android.providers.media.photopicker.v2.sqlite.MediaSetsDatabaseUtil;
 import com.android.providers.media.photopicker.v2.sqlite.PickerSQLConstants;
@@ -182,7 +183,7 @@ public class MediaInMediaSetsSyncWorkerTest {
 
     @Test
     public void testMediaInMediaSetSyncWithCloudProvider() throws
-            ExecutionException, InterruptedException {
+            ExecutionException, InterruptedException, RequestObsoleteException {
 
         String categoryId = "categoryId";
         String auth = String.valueOf(SYNC_CLOUD_ONLY);
@@ -301,7 +302,7 @@ public class MediaInMediaSetsSyncWorkerTest {
 
     @Test
     public void testMediaInMediaSetsSyncLocalProvider() throws
-            ExecutionException, InterruptedException {
+            ExecutionException, InterruptedException, RequestObsoleteException {
 
         doReturn(SearchProvider.AUTHORITY).when(mMockSyncController).getLocalProvider();
 
@@ -407,7 +408,7 @@ public class MediaInMediaSetsSyncWorkerTest {
     @Test
     @Ignore("Enable when b/391639613 is fixed")
     public void testMediaSetContentsSyncLoop() throws
-            ExecutionException, InterruptedException {
+            ExecutionException, InterruptedException, RequestObsoleteException {
 
         String categoryId = "categoryId";
         String auth = String.valueOf(SYNC_CLOUD_ONLY);
@@ -502,7 +503,7 @@ public class MediaInMediaSetsSyncWorkerTest {
 
     @Test
     public void testMediaInMediaSetSyncComplete() throws
-            ExecutionException, InterruptedException {
+            ExecutionException, InterruptedException, RequestObsoleteException {
 
         String categoryId = "categoryId";
         String auth = String.valueOf(SYNC_CLOUD_ONLY);
diff --git a/tests/src/com/android/providers/media/photopicker/sync/MediaSetsResetWorkerTest.java b/tests/src/com/android/providers/media/photopicker/sync/MediaSetsResetWorkerTest.java
index 17678b08b..3f7b2d262 100644
--- a/tests/src/com/android/providers/media/photopicker/sync/MediaSetsResetWorkerTest.java
+++ b/tests/src/com/android/providers/media/photopicker/sync/MediaSetsResetWorkerTest.java
@@ -51,6 +51,7 @@ import com.android.providers.media.cloudproviders.SearchProvider;
 import com.android.providers.media.photopicker.PickerSyncController;
 import com.android.providers.media.photopicker.data.PickerDatabaseHelper;
 import com.android.providers.media.photopicker.data.PickerDbFacade;
+import com.android.providers.media.photopicker.util.exceptions.RequestObsoleteException;
 import com.android.providers.media.photopicker.v2.sqlite.MediaInMediaSetsDatabaseUtil;
 import com.android.providers.media.photopicker.v2.sqlite.MediaSetsDatabaseUtil;
 import com.android.providers.media.photopicker.v2.sqlite.PickerSQLConstants;
@@ -113,7 +114,7 @@ public class MediaSetsResetWorkerTest {
 
     @Test
     public void testMediaSetsAndMediaSetsContentCacheReset() throws
-            ExecutionException, InterruptedException   {
+            ExecutionException, InterruptedException, RequestObsoleteException {
         Cursor c = getCursorForMediaSetInsertionTest();
         List<String> mimeTypes = new ArrayList<>();
         mimeTypes.add(mMimeType);
diff --git a/tests/src/com/android/providers/media/photopicker/v2/PickerDataLayerV2Test.java b/tests/src/com/android/providers/media/photopicker/v2/PickerDataLayerV2Test.java
index 83c5c1ada..d4d904648 100644
--- a/tests/src/com/android/providers/media/photopicker/v2/PickerDataLayerV2Test.java
+++ b/tests/src/com/android/providers/media/photopicker/v2/PickerDataLayerV2Test.java
@@ -117,6 +117,7 @@ import com.android.providers.media.photopicker.data.PickerDatabaseHelper;
 import com.android.providers.media.photopicker.data.PickerDbFacade;
 import com.android.providers.media.photopicker.data.model.UserId;
 import com.android.providers.media.photopicker.sync.PickerSyncLockManager;
+import com.android.providers.media.photopicker.util.exceptions.RequestObsoleteException;
 import com.android.providers.media.photopicker.v2.model.MediaGroup;
 import com.android.providers.media.photopicker.v2.model.MediaInMediaSetSyncRequestParams;
 import com.android.providers.media.photopicker.v2.model.MediaSetsSyncRequestParams;
@@ -815,7 +816,7 @@ public class PickerDataLayerV2Test {
     }
 
     @Test
-    public void testQueryMediaSets() {
+    public void testQueryMediaSets() throws RequestObsoleteException {
         List<String> mimeTypes = new ArrayList<>();
         mimeTypes.add("image/*");
         String mediaSetId1 = "mediaSetId1";
@@ -1030,7 +1031,7 @@ public class PickerDataLayerV2Test {
     }
 
     @Test
-    public void testQueryMediaInMediaSet() {
+    public void testQueryMediaInMediaSet() throws RequestObsoleteException {
         final Cursor cursor1 = getLocalMediaCursor(LOCAL_ID_1, 0);
         assertAddMediaOperation(mFacade, LOCAL_PROVIDER, cursor1, 1);
         final Cursor cursor2 = getLocalMediaCursor(LOCAL_ID_2, 0);
diff --git a/tests/src/com/android/providers/media/photopicker/v2/sqlite/MediaInMediaSetsDatabaseUtilTest.java b/tests/src/com/android/providers/media/photopicker/v2/sqlite/MediaInMediaSetsDatabaseUtilTest.java
index f132eb626..cbf7baa36 100644
--- a/tests/src/com/android/providers/media/photopicker/v2/sqlite/MediaInMediaSetsDatabaseUtilTest.java
+++ b/tests/src/com/android/providers/media/photopicker/v2/sqlite/MediaInMediaSetsDatabaseUtilTest.java
@@ -58,6 +58,7 @@ import com.android.providers.media.photopicker.PickerSyncController;
 import com.android.providers.media.photopicker.data.PickerDatabaseHelper;
 import com.android.providers.media.photopicker.data.PickerDbFacade;
 import com.android.providers.media.photopicker.sync.PickerSyncLockManager;
+import com.android.providers.media.photopicker.util.exceptions.RequestObsoleteException;
 
 import org.junit.After;
 import org.junit.Before;
@@ -100,7 +101,7 @@ public class MediaInMediaSetsDatabaseUtilTest {
     }
 
     @Test
-    public void testQueryLocalMediaInMediaSet() {
+    public void testQueryLocalMediaInMediaSet() throws RequestObsoleteException {
         final Cursor cursor1 = getLocalMediaCursor(LOCAL_ID_1, 0);
         assertAddMediaOperation(mFacade, LOCAL_PROVIDER, cursor1, 1);
         final Cursor cursor2 = getLocalMediaCursor(LOCAL_ID_2, 0);
@@ -158,7 +159,7 @@ public class MediaInMediaSetsDatabaseUtilTest {
     }
 
     @Test
-    public void testQueryCloudMediaInMediaSet() {
+    public void testQueryCloudMediaInMediaSet() throws RequestObsoleteException {
         final Cursor cursor1 = getCloudMediaCursor(CLOUD_ID_1, null, 0);
         assertAddMediaOperation(mFacade, CLOUD_PROVIDER, cursor1, 1);
         final Cursor cursor2 = getCloudMediaCursor(CLOUD_ID_2, LOCAL_ID_2, 0);
@@ -212,7 +213,8 @@ public class MediaInMediaSetsDatabaseUtilTest {
     }
 
     @Test
-    public void testQueryMediaInMediaSetForSpecificMediaSetPickerId() {
+    public void testQueryMediaInMediaSetForSpecificMediaSetPickerId()
+            throws RequestObsoleteException {
         final Cursor cursor1 = getCloudMediaCursor(CLOUD_ID_1, null, 0);
         assertAddMediaOperation(mFacade, CLOUD_PROVIDER, cursor1, 1);
         final Cursor cursor2 = getCloudMediaCursor(CLOUD_ID_2, LOCAL_ID_2, 0);
@@ -261,7 +263,7 @@ public class MediaInMediaSetsDatabaseUtilTest {
     }
 
     @Test
-    public void testQueryMediaInMediaSetsSortOrder() {
+    public void testQueryMediaInMediaSetsSortOrder() throws RequestObsoleteException {
         final long dateTaken = 0L;
 
         final Cursor cursor1 = getCloudMediaCursor(CLOUD_ID_1, null, dateTaken + 1);
@@ -335,7 +337,7 @@ public class MediaInMediaSetsDatabaseUtilTest {
     }
 
     @Test
-    public void testQueryMediaInMediaSetsPagination() {
+    public void testQueryMediaInMediaSetsPagination() throws RequestObsoleteException {
         final Cursor cursor1 = getCloudMediaCursor(CLOUD_ID_1, null, 0);
         assertAddMediaOperation(mFacade, CLOUD_PROVIDER, cursor1, 1);
         final Cursor cursor2 = getCloudMediaCursor(CLOUD_ID_2, LOCAL_ID_2, 0);
@@ -384,7 +386,7 @@ public class MediaInMediaSetsDatabaseUtilTest {
     }
 
     @Test
-    public void testQueryMediaInMediaSetsMimeTypeFilter() {
+    public void testQueryMediaInMediaSetsMimeTypeFilter() throws RequestObsoleteException {
         final Cursor cursor1 = getMediaCursor(CLOUD_ID_1, DATE_TAKEN_MS, GENERATION_MODIFIED,
                 /* mediaStoreUri */ null, /* sizeBytes */ 1, MP4_VIDEO_MIME_TYPE,
                 STANDARD_MIME_TYPE_EXTENSION, /* isFavorite */ false);
@@ -453,7 +455,7 @@ public class MediaInMediaSetsDatabaseUtilTest {
     }
 
     @Test
-    public void testQueryMediaInMediaSetsLocalProviderFilter() {
+    public void testQueryMediaInMediaSetsLocalProviderFilter() throws RequestObsoleteException {
         final Cursor cursor1 = getCloudMediaCursor(CLOUD_ID_1, null, 0);
         assertAddMediaOperation(mFacade, CLOUD_PROVIDER, cursor1, 1);
         final Cursor cursor2 = getCloudMediaCursor(CLOUD_ID_2, LOCAL_ID_2, 0);
@@ -507,7 +509,7 @@ public class MediaInMediaSetsDatabaseUtilTest {
     }
 
     @Test
-    public void testQueryMediaInMediaSetsCloudProviderFilter() {
+    public void testQueryMediaInMediaSetsCloudProviderFilter() throws RequestObsoleteException {
         final Cursor cursor1 = getCloudMediaCursor(CLOUD_ID_1, null, 0);
         assertAddMediaOperation(mFacade, CLOUD_PROVIDER, cursor1, 1);
         final Cursor cursor2 = getCloudMediaCursor(CLOUD_ID_2, LOCAL_ID_2, 0);
@@ -574,7 +576,7 @@ public class MediaInMediaSetsDatabaseUtilTest {
     }
 
     @Test
-    public void testCacheMediaInMediaSet() {
+    public void testCacheMediaInMediaSet() throws RequestObsoleteException {
         final Cursor cursor1 = getCloudMediaCursor(CLOUD_ID_1, null, 0);
         assertAddMediaOperation(mFacade, CLOUD_PROVIDER, cursor1, 1);
         final Cursor cursor2 = getLocalMediaCursor(LOCAL_ID_2, 0);
@@ -608,7 +610,7 @@ public class MediaInMediaSetsDatabaseUtilTest {
     }
 
     @Test
-    public void testClearMediaInMediaSetCache() {
+    public void testClearMediaInMediaSetCache() throws RequestObsoleteException {
         // Insert data
         final Cursor cursor1 = getCloudMediaCursor(CLOUD_ID_1, null, 0);
         assertAddMediaOperation(mFacade, CLOUD_PROVIDER, cursor1, 1);
diff --git a/tests/src/com/android/providers/media/photopicker/v2/sqlite/MediaSetsDatabaseUtilsTest.java b/tests/src/com/android/providers/media/photopicker/v2/sqlite/MediaSetsDatabaseUtilsTest.java
index 72ccb7795..336bccc4a 100644
--- a/tests/src/com/android/providers/media/photopicker/v2/sqlite/MediaSetsDatabaseUtilsTest.java
+++ b/tests/src/com/android/providers/media/photopicker/v2/sqlite/MediaSetsDatabaseUtilsTest.java
@@ -33,6 +33,7 @@ import android.util.Pair;
 import androidx.test.platform.app.InstrumentationRegistry;
 
 import com.android.providers.media.photopicker.data.PickerDatabaseHelper;
+import com.android.providers.media.photopicker.util.exceptions.RequestObsoleteException;
 import com.android.providers.media.photopicker.v2.model.MediaSetsSyncRequestParams;
 
 import org.junit.After;
@@ -71,7 +72,7 @@ public class MediaSetsDatabaseUtilsTest {
     }
 
     @Test
-    public void testInsertMediaSetMetadataIntoMediaSetsTable() {
+    public void testInsertMediaSetMetadataIntoMediaSetsTable() throws RequestObsoleteException {
         Cursor c = getCursorForMediaSetInsertionTest();
         List<String> mimeTypes = new ArrayList<>();
         mimeTypes.add(mMimeType);
@@ -83,14 +84,16 @@ public class MediaSetsDatabaseUtilsTest {
     }
 
     @Test
-    public void testInsertMediaSetMetadataIntoMediaTableMimeTypeFilter() {
+    public void testInsertMediaSetMetadataIntoMediaTableMimeTypeFilter()
+            throws RequestObsoleteException {
         Cursor c = getCursorForMediaSetInsertionTest();
         List<String> firstMimeTypeFilter = new ArrayList<>();
         firstMimeTypeFilter.add("image/*");
         firstMimeTypeFilter.add("video/*");
 
         int firstInsertionCount = MediaSetsDatabaseUtil.cacheMediaSets(
-                mDatabase, c, mCategoryId, mAuthority, firstMimeTypeFilter);
+                mDatabase, c, mCategoryId, mAuthority, firstMimeTypeFilter
+               );
         assertEquals("Count of inserted media sets should be equal to the cursor size",
                 /*expected*/ c.getCount(), /*actual*/ firstInsertionCount);
 
@@ -109,7 +112,7 @@ public class MediaSetsDatabaseUtilsTest {
     }
 
     @Test
-    public void testInsertMediaSetMetadataWhenMediaSetIdIsNull() {
+    public void testInsertMediaSetMetadataWhenMediaSetIdIsNull() throws RequestObsoleteException {
         List<String> mimeTypes = new ArrayList<>();
         mimeTypes.add(mMimeType);
 
@@ -129,7 +132,7 @@ public class MediaSetsDatabaseUtilsTest {
     }
 
     @Test
-    public void testGetMediaSetMetadataForCategory() {
+    public void testGetMediaSetMetadataForCategory() throws RequestObsoleteException {
         Cursor c = getCursorForMediaSetInsertionTest();
         List<String> mimeTypes = new ArrayList<>();
         mimeTypes.add(mMimeType);
@@ -163,7 +166,7 @@ public class MediaSetsDatabaseUtilsTest {
     }
 
     @Test
-    public void testUpdateAndGetMediaInMediaSetResumeKey() {
+    public void testUpdateAndGetMediaInMediaSetResumeKey() throws RequestObsoleteException {
         Cursor c = getCursorForMediaSetInsertionTest();
         List<String> mimeTypes = new ArrayList<>();
         mimeTypes.add(mMimeType);
@@ -201,7 +204,8 @@ public class MediaSetsDatabaseUtilsTest {
     }
 
     @Test
-    public void testGetMediaSetIdAndMimeTypesUsingMediaSetPickerId() {
+    public void testGetMediaSetIdAndMimeTypesUsingMediaSetPickerId()
+            throws RequestObsoleteException {
         Cursor c = getCursorForMediaSetInsertionTest();
         List<String> mimeTypes = new ArrayList<>();
         mimeTypes.add(mMimeType);
@@ -234,7 +238,7 @@ public class MediaSetsDatabaseUtilsTest {
     }
 
     @Test
-    public void testClearMediaSetsCache() {
+    public void testClearMediaSetsCache() throws RequestObsoleteException {
         // Insert metadata into the table
         Cursor c = getCursorForMediaSetInsertionTest();
         List<String> mimeTypes = new ArrayList<>();
diff --git a/tests/src/com/android/providers/media/photopickersearch/PickerSearchProviderClientTest.java b/tests/src/com/android/providers/media/photopickersearch/PickerSearchProviderClientTest.java
index 60da5d032..5e227385a 100644
--- a/tests/src/com/android/providers/media/photopickersearch/PickerSearchProviderClientTest.java
+++ b/tests/src/com/android/providers/media/photopickersearch/PickerSearchProviderClientTest.java
@@ -30,6 +30,7 @@ import static org.junit.Assert.assertTrue;
 
 import android.content.Context;
 import android.database.Cursor;
+import android.os.OperationCanceledException;
 import android.platform.test.annotations.RequiresFlagsEnabled;
 import android.platform.test.flag.junit.CheckFlagsRule;
 import android.platform.test.flag.junit.DeviceFlagsValueProvider;
@@ -99,7 +100,7 @@ public class PickerSearchProviderClientTest {
     }
 
     @Test
-    public void testFetchMediasInMediaSetFromCmp() {
+    public void testFetchMediasInMediaSetFromCmp() throws OperationCanceledException {
         Cursor cursor = mPickerSearchProviderClient.fetchMediasInMediaSetFromCmp(TEST_MEDIA_SET_ID,
                 null, 100, CloudMediaProviderContract.SORT_ORDER_DESC_DATE_TAKEN,
                 null, null);
@@ -120,7 +121,7 @@ public class PickerSearchProviderClientTest {
     }
 
     @Test
-    public void testFetchMediaSetsFromCmp() {
+    public void testFetchMediaSetsFromCmp() throws OperationCanceledException {
         Cursor cursor = mPickerSearchProviderClient.fetchMediaSetsFromCmp(TEST_MEDIA_CATEGORY_ID,
                 null, 10, null, null);
         cursor.moveToFirst();