Remove unusued CloudMediaProvider API
queryMedia(String id) is not used.
Test: atest ExternalDbFacadeTest
Bug: 201662294
Change-Id: Ia3d975d2115a60fe15bfed0ecf86dbc19ca65f5b
Merged-In: Ia3d975d2115a60fe15bfed0ecf86dbc19ca65f5b
(cherry picked from commit e331c9a5551c53a3759ca6e29e5f3d3321d9d154)
diff --git a/apex/framework/java/android/provider/CloudMediaProvider.java b/apex/framework/java/android/provider/CloudMediaProvider.java
index 4feaa45..aed906b 100644
--- a/apex/framework/java/android/provider/CloudMediaProvider.java
+++ b/apex/framework/java/android/provider/CloudMediaProvider.java
@@ -29,7 +29,6 @@
import static android.provider.CloudMediaProviderContract.URI_PATH_ALBUM;
import static android.provider.CloudMediaProviderContract.URI_PATH_DELETED_MEDIA;
import static android.provider.CloudMediaProviderContract.URI_PATH_MEDIA;
-import static android.provider.CloudMediaProviderContract.URI_PATH_MEDIA_EXACT;
import static android.provider.CloudMediaProviderContract.URI_PATH_MEDIA_COLLECTION_INFO;
import static android.provider.CloudMediaProviderContract.URI_PATH_SURFACE_CONTROLLER;
@@ -113,11 +112,10 @@
private static final String TAG = "CloudMediaProvider";
private static final int MATCH_MEDIAS = 1;
- private static final int MATCH_MEDIA_ID = 2;
- private static final int MATCH_DELETED_MEDIAS = 3;
- private static final int MATCH_ALBUMS = 4;
- private static final int MATCH_MEDIA_COLLECTION_INFO = 5;
- private static final int MATCH_SURFACE_CONTROLLER = 6;
+ private static final int MATCH_DELETED_MEDIAS = 2;
+ private static final int MATCH_ALBUMS = 3;
+ private static final int MATCH_MEDIA_COLLECTION_INFO = 4;
+ private static final int MATCH_SURFACE_CONTROLLER = 5;
private static final boolean DEFAULT_LOOPING_PLAYBACK_ENABLED = true;
private static final boolean DEFAULT_SURFACE_CONTROLLER_AUDIO_MUTE_ENABLED = false;
@@ -140,7 +138,6 @@
private void registerAuthority(String authority) {
mMatcher.addURI(authority, URI_PATH_MEDIA, MATCH_MEDIAS);
- mMatcher.addURI(authority, URI_PATH_MEDIA_EXACT, MATCH_MEDIA_ID);
mMatcher.addURI(authority, URI_PATH_DELETED_MEDIA, MATCH_DELETED_MEDIAS);
mMatcher.addURI(authority, URI_PATH_ALBUM, MATCH_ALBUMS);
mMatcher.addURI(authority, URI_PATH_MEDIA_COLLECTION_INFO, MATCH_MEDIA_COLLECTION_INFO);
@@ -189,19 +186,6 @@
public abstract Bundle onGetMediaCollectionInfo(@NonNull Bundle extras);
/**
- * Returns a {@link Cursor} to a single media item containing the columns representing the media
- * item identified by the {@link CloudMediaProviderContract.MediaColumns#ID} with
- * {@code mediaId}.
- *
- * @param mediaId the media item to return
- * @return cursor representing single media item containing all
- * {@link CloudMediaProviderContract.MediaColumns}
- */
- @SuppressWarnings("unused")
- @NonNull
- public abstract Cursor onQueryMedia(@NonNull String mediaId);
-
- /**
* Returns a cursor representing all media items in the media collection optionally filtered by
* {@code extras} and sorted in reverse chronological order of
* {@link CloudMediaProviderContract.MediaColumns#DATE_TAKEN_MILLIS}, i.e. most recent items
@@ -486,8 +470,6 @@
switch (mMatcher.match(uri)) {
case MATCH_MEDIAS:
return onQueryMedia(queryArgs);
- case MATCH_MEDIA_ID:
- return onQueryMedia(uri.getLastPathSegment());
case MATCH_DELETED_MEDIAS:
return onQueryDeletedMedia(queryArgs);
case MATCH_ALBUMS:
diff --git a/apex/framework/java/android/provider/CloudMediaProviderContract.java b/apex/framework/java/android/provider/CloudMediaProviderContract.java
index bc19561..e5ec35b 100644
--- a/apex/framework/java/android/provider/CloudMediaProviderContract.java
+++ b/apex/framework/java/android/provider/CloudMediaProviderContract.java
@@ -656,13 +656,6 @@
public static final String URI_PATH_MEDIA = "media";
/**
- * URI path for {@link CloudMediaProvider#onQueryMedia}
- *
- * {@hide}
- */
- public static final String URI_PATH_MEDIA_EXACT = URI_PATH_MEDIA + "/*";
-
- /**
* URI path for {@link CloudMediaProvider#onQueryDeletedMedia}
*
* {@hide}
diff --git a/src/com/android/providers/media/photopicker/PhotoPickerProvider.java b/src/com/android/providers/media/photopicker/PhotoPickerProvider.java
index 715a100..d81aa9d 100644
--- a/src/com/android/providers/media/photopicker/PhotoPickerProvider.java
+++ b/src/com/android/providers/media/photopicker/PhotoPickerProvider.java
@@ -88,17 +88,12 @@
}
@Override
- public Cursor onQueryMedia(@NonNull String mediaId) {
- return mDbFacade.queryMediaId(Long.parseLong(mediaId));
- }
-
- @Override
public Cursor onQueryMedia(@Nullable Bundle extras) {
// TODO(b/190713331): Handle extra_page
final CloudProviderQueryExtras queryExtras =
CloudProviderQueryExtras.fromCloudMediaBundle(extras);
- return mDbFacade.queryMediaGeneration(queryExtras.getGeneration(), queryExtras.getAlbumId(),
+ return mDbFacade.queryMedia(queryExtras.getGeneration(), queryExtras.getAlbumId(),
queryExtras.getMimeType());
}
diff --git a/src/com/android/providers/media/photopicker/data/ExternalDbFacade.java b/src/com/android/providers/media/photopicker/data/ExternalDbFacade.java
index b30fced..101fd01 100644
--- a/src/com/android/providers/media/photopicker/data/ExternalDbFacade.java
+++ b/src/com/android/providers/media/photopicker/data/ExternalDbFacade.java
@@ -258,7 +258,7 @@
* Returns all items from the files table where {@link MediaColumns#GENERATION_MODIFIED}
* is greater than {@code generation}.
*/
- public Cursor queryMediaGeneration(long generation, String albumId, String mimeType) {
+ public Cursor queryMedia(long generation, String albumId, String mimeType) {
final List<String> selectionArgs = new ArrayList<>();
final String orderBy = CloudMediaProviderContract.MediaColumns.DATE_TAKEN_MILLIS + " DESC";
@@ -275,19 +275,6 @@
});
}
- /** Returns the media item from the files table with row id {@code id}. */
- public Cursor queryMediaId(long id) {
- final String[] selectionArgs = new String[] {String.valueOf(id)};
-
- return mDatabaseHelper.runWithTransaction(db -> {
- SQLiteQueryBuilder qb = createMediaQueryBuilder();
- qb.appendWhereStandalone(WHERE_ID);
-
- return qb.query(db, PROJECTION_MEDIA_COLUMNS, /* select */ null, selectionArgs,
- /* groupBy */ null, /* having */ null, /* orderBy */ null);
- });
- }
-
/**
* Returns the total count and max {@link MediaColumns#GENERATION_MODIFIED} value
* of the media items in the files table greater than {@code generation}.
diff --git a/tests/src/com/android/providers/media/cloudproviders/CloudProviderNoIntentFilter.java b/tests/src/com/android/providers/media/cloudproviders/CloudProviderNoIntentFilter.java
index f440b1e..bb24193 100644
--- a/tests/src/com/android/providers/media/cloudproviders/CloudProviderNoIntentFilter.java
+++ b/tests/src/com/android/providers/media/cloudproviders/CloudProviderNoIntentFilter.java
@@ -36,11 +36,6 @@
}
@Override
- public Cursor onQueryMedia(String mediaId) {
- throw new UnsupportedOperationException("onQueryMedia by id not supported");
- }
-
- @Override
public Cursor onQueryMedia(Bundle extras) {
throw new UnsupportedOperationException("onQueryMedia not supported");
}
diff --git a/tests/src/com/android/providers/media/cloudproviders/CloudProviderNoPermission.java b/tests/src/com/android/providers/media/cloudproviders/CloudProviderNoPermission.java
index 97b4aec..9426b5d 100644
--- a/tests/src/com/android/providers/media/cloudproviders/CloudProviderNoPermission.java
+++ b/tests/src/com/android/providers/media/cloudproviders/CloudProviderNoPermission.java
@@ -36,11 +36,6 @@
}
@Override
- public Cursor onQueryMedia(String mediaId) {
- throw new UnsupportedOperationException("onQueryMedia by id not supported");
- }
-
- @Override
public Cursor onQueryMedia(Bundle extras) {
throw new UnsupportedOperationException("onQueryMedia not supported");
}
diff --git a/tests/src/com/android/providers/media/cloudproviders/CloudProviderPrimary.java b/tests/src/com/android/providers/media/cloudproviders/CloudProviderPrimary.java
index eca46ab..a007139 100644
--- a/tests/src/com/android/providers/media/cloudproviders/CloudProviderPrimary.java
+++ b/tests/src/com/android/providers/media/cloudproviders/CloudProviderPrimary.java
@@ -49,11 +49,6 @@
}
@Override
- public Cursor onQueryMedia(String mediaId) {
- throw new UnsupportedOperationException("onQueryMedia by id not supported");
- }
-
- @Override
public Cursor onQueryMedia(Bundle extras) {
final CloudProviderQueryExtras queryExtras =
CloudProviderQueryExtras.fromCloudMediaBundle(extras);
diff --git a/tests/src/com/android/providers/media/cloudproviders/CloudProviderSecondary.java b/tests/src/com/android/providers/media/cloudproviders/CloudProviderSecondary.java
index 2aafb0a..abcb92f 100644
--- a/tests/src/com/android/providers/media/cloudproviders/CloudProviderSecondary.java
+++ b/tests/src/com/android/providers/media/cloudproviders/CloudProviderSecondary.java
@@ -49,11 +49,6 @@
}
@Override
- public Cursor onQueryMedia(String mediaId) {
- throw new UnsupportedOperationException("onQueryMedia by id not supported");
- }
-
- @Override
public Cursor onQueryMedia(Bundle extras) {
final CloudProviderQueryExtras queryExtras =
CloudProviderQueryExtras.fromCloudMediaBundle(extras);
diff --git a/tests/src/com/android/providers/media/photopicker/LocalProvider.java b/tests/src/com/android/providers/media/photopicker/LocalProvider.java
index f674872..3916c9d 100644
--- a/tests/src/com/android/providers/media/photopicker/LocalProvider.java
+++ b/tests/src/com/android/providers/media/photopicker/LocalProvider.java
@@ -48,11 +48,6 @@
}
@Override
- public Cursor onQueryMedia(String mediaId) {
- throw new UnsupportedOperationException("onQueryMedia by id not supported");
- }
-
- @Override
public Cursor onQueryMedia(Bundle extras) {
final CloudProviderQueryExtras queryExtras =
CloudProviderQueryExtras.fromCloudMediaBundle(extras);
diff --git a/tests/src/com/android/providers/media/photopicker/data/ExternalDbFacadeTest.java b/tests/src/com/android/providers/media/photopicker/data/ExternalDbFacadeTest.java
index e900239..b7bf23f 100644
--- a/tests/src/com/android/providers/media/photopicker/data/ExternalDbFacadeTest.java
+++ b/tests/src/com/android/providers/media/photopicker/data/ExternalDbFacadeTest.java
@@ -404,7 +404,7 @@
}
@Test
- public void testQueryMediaGeneration_match() throws Exception {
+ public void testQueryMedia_match() throws Exception {
try (DatabaseHelper helper = new TestDatabaseHelper(sIsolatedContext)) {
ExternalDbFacade facade = new ExternalDbFacade(sIsolatedContext, helper);
@@ -419,7 +419,7 @@
cv.put(MediaColumns.GENERATION_MODIFIED, GENERATION_MODIFIED2);
helper.runWithTransaction(db -> db.insert(TABLE_FILES, null, cv));
- try (Cursor cursor = queryAllMediaGeneration(facade)) {
+ try (Cursor cursor = queryAllMedia(facade)) {
assertThat(cursor.getCount()).isEqualTo(2);
cursor.moveToFirst();
@@ -429,7 +429,7 @@
assertMediaColumns(facade, cursor, ID2, DATE_TAKEN_MS1);
}
- try (Cursor cursor = facade.queryMediaGeneration(GENERATION_MODIFIED1,
+ try (Cursor cursor = facade.queryMedia(GENERATION_MODIFIED1,
/* albumId */ null, /* mimeType */ null)) {
assertThat(cursor.getCount()).isEqualTo(1);
@@ -440,7 +440,7 @@
}
@Test
- public void testQueryMediaGeneration_noMatch() throws Exception {
+ public void testQueryMedia_noMatch() throws Exception {
ContentValues cvPending = getContentValues(DATE_TAKEN_MS1, GENERATION_MODIFIED1);
cvPending.put(MediaColumns.IS_PENDING, 1);
@@ -453,14 +453,14 @@
helper.runWithTransaction(db -> db.insert(TABLE_FILES, null, cvPending));
helper.runWithTransaction(db -> db.insert(TABLE_FILES, null, cvTrashed));
- try (Cursor cursor = queryAllMediaGeneration(facade)) {
+ try (Cursor cursor = queryAllMedia(facade)) {
assertThat(cursor.getCount()).isEqualTo(0);
}
}
}
@Test
- public void testQueryMediaGeneration_withDateModified() throws Exception {
+ public void testQueryMedia_withDateModified() throws Exception {
try (DatabaseHelper helper = new TestDatabaseHelper(sIsolatedContext)) {
ExternalDbFacade facade = new ExternalDbFacade(sIsolatedContext, helper);
long dateModifiedSeconds1 = DATE_TAKEN_MS1 / 1000;
@@ -478,7 +478,7 @@
cv.put(MediaColumns.GENERATION_MODIFIED, GENERATION_MODIFIED2);
helper.runWithTransaction(db -> db.insert(TABLE_FILES, null, cv));
- try (Cursor cursor = queryAllMediaGeneration(facade)) {
+ try (Cursor cursor = queryAllMedia(facade)) {
assertThat(cursor.getCount()).isEqualTo(2);
cursor.moveToFirst();
@@ -488,7 +488,7 @@
assertMediaColumns(facade, cursor, ID2, dateModifiedSeconds1 * 1000);
}
- try (Cursor cursor = facade.queryMediaGeneration(GENERATION_MODIFIED1,
+ try (Cursor cursor = facade.queryMedia(GENERATION_MODIFIED1,
/* albumId */ null, /* mimeType */ null)) {
assertThat(cursor.getCount()).isEqualTo(1);
@@ -499,7 +499,7 @@
}
@Test
- public void testQueryMediaGeneration_withMimeType() throws Exception {
+ public void testQueryMedia_withMimeType() throws Exception {
try (DatabaseHelper helper = new TestDatabaseHelper(sIsolatedContext)) {
ExternalDbFacade facade = new ExternalDbFacade(sIsolatedContext, helper);
@@ -507,19 +507,19 @@
ContentValues cv = getContentValues(DATE_TAKEN_MS1, GENERATION_MODIFIED1);
helper.runWithTransaction(db -> db.insert(TABLE_FILES, null, cv));
- try (Cursor cursor = queryAllMediaGeneration(facade)) {
+ try (Cursor cursor = queryAllMedia(facade)) {
assertThat(cursor.getCount()).isEqualTo(1);
cursor.moveToFirst();
assertMediaColumns(facade, cursor, ID1, DATE_TAKEN_MS1);
}
- try (Cursor cursor = facade.queryMediaGeneration(/* generation */ 0,
+ try (Cursor cursor = facade.queryMedia(/* generation */ 0,
/* albumId */ null, VIDEO_MIME_TYPE)) {
assertThat(cursor.getCount()).isEqualTo(0);
}
- try (Cursor cursor = facade.queryMediaGeneration(/* generation */ 0,
+ try (Cursor cursor = facade.queryMedia(/* generation */ 0,
/* albumId */ null, IMAGE_MIME_TYPE)) {
assertThat(cursor.getCount()).isEqualTo(1);
@@ -530,17 +530,17 @@
}
@Test
- public void testQueryMediaGeneration_withAlbum() throws Exception {
+ public void testQueryMedia_withAlbum() throws Exception {
try (DatabaseHelper helper = new TestDatabaseHelper(sIsolatedContext)) {
ExternalDbFacade facade = new ExternalDbFacade(sIsolatedContext, helper);
initMediaInAllAlbums(helper);
- try (Cursor cursor = queryAllMediaGeneration(facade)) {
+ try (Cursor cursor = queryAllMedia(facade)) {
assertThat(cursor.getCount()).isEqualTo(5);
}
- try (Cursor cursor = facade.queryMediaGeneration(/* generation */ 0,
+ try (Cursor cursor = facade.queryMedia(/* generation */ 0,
ALBUM_ID_CAMERA, /* mimeType */ null)) {
assertThat(cursor.getCount()).isEqualTo(1);
@@ -548,7 +548,7 @@
assertMediaColumns(facade, cursor, ID1, DATE_TAKEN_MS1);
}
- try (Cursor cursor = facade.queryMediaGeneration(/* generation */ 0,
+ try (Cursor cursor = facade.queryMedia(/* generation */ 0,
ALBUM_ID_SCREENSHOTS, /* mimeType */ null)) {
assertThat(cursor.getCount()).isEqualTo(1);
@@ -556,7 +556,7 @@
assertMediaColumns(facade, cursor, ID2, DATE_TAKEN_MS2);
}
- try (Cursor cursor = facade.queryMediaGeneration(/* generation */ 0,
+ try (Cursor cursor = facade.queryMedia(/* generation */ 0,
ALBUM_ID_DOWNLOADS, /* mimeType */ null)) {
assertThat(cursor.getCount()).isEqualTo(1);
@@ -564,7 +564,7 @@
assertMediaColumns(facade, cursor, ID3, DATE_TAKEN_MS3);
}
- try (Cursor cursor = facade.queryMediaGeneration(/* generation */ 0,
+ try (Cursor cursor = facade.queryMedia(/* generation */ 0,
ALBUM_ID_VIDEOS, /* mimeType */ null)) {
assertThat(cursor.getCount()).isEqualTo(2);
@@ -580,7 +580,7 @@
}
@Test
- public void testQueryMediaGeneration_withAlbumAndMimeType() throws Exception {
+ public void testQueryMedia_withAlbumAndMimeType() throws Exception {
try (DatabaseHelper helper = new TestDatabaseHelper(sIsolatedContext)) {
ExternalDbFacade facade = new ExternalDbFacade(sIsolatedContext, helper);
@@ -589,24 +589,25 @@
cv.put(MediaColumns.RELATIVE_PATH, ExternalDbFacade.RELATIVE_PATH_CAMERA);
helper.runWithTransaction(db -> db.insert(TABLE_FILES, null, cv));
- try (Cursor cursor = queryAllMediaGeneration(facade)) {
+ try (Cursor cursor = queryAllMedia(facade)) {
assertThat(cursor.getCount()).isEqualTo(1);
cursor.moveToFirst();
assertMediaColumns(facade, cursor, ID1, DATE_TAKEN_MS1);
}
- try (Cursor cursor = facade.queryMediaGeneration(/* generation */ 0,
+ try (Cursor cursor = facade.queryMedia(/* generation */ 0,
ALBUM_ID_SCREENSHOTS, IMAGE_MIME_TYPE)) {
assertThat(cursor.getCount()).isEqualTo(0);
}
- try (Cursor cursor = facade.queryMediaGeneration(/* generation */ 0,
+
+ try (Cursor cursor = facade.queryMedia(/* generation */ 0,
ALBUM_ID_CAMERA, VIDEO_MIME_TYPE)) {
assertThat(cursor.getCount()).isEqualTo(0);
}
- try (Cursor cursor = facade.queryMediaGeneration(/* generation */ 0,
+ try (Cursor cursor = facade.queryMedia(/* generation */ 0,
ALBUM_ID_CAMERA, IMAGE_MIME_TYPE)) {
assertThat(cursor.getCount()).isEqualTo(1);
@@ -617,84 +618,6 @@
}
@Test
- public void testQueryMediaId_match() throws Exception {
- try (DatabaseHelper helper = new TestDatabaseHelper(sIsolatedContext)) {
- ExternalDbFacade facade = new ExternalDbFacade(sIsolatedContext, helper);
-
- ContentValues cv = getContentValues(DATE_TAKEN_MS1, GENERATION_MODIFIED1);
- helper.runWithTransaction(db -> db.insert(TABLE_FILES, null, cv));
-
- try (Cursor cursor = facade.queryMediaId(ID1)) {
- assertThat(cursor.getCount()).isEqualTo(1);
-
- cursor.moveToFirst();
- assertMediaColumns(facade, cursor, ID1, DATE_TAKEN_MS1);
- }
- }
- }
-
- @Test
- public void testQueryMediaId_noMatch() throws Exception {
- try (DatabaseHelper helper = new TestDatabaseHelper(sIsolatedContext)) {
- ExternalDbFacade facade = new ExternalDbFacade(sIsolatedContext, helper);
-
- ContentValues cvPending = getContentValues(DATE_TAKEN_MS1, GENERATION_MODIFIED1);
- cvPending.put(MediaColumns.IS_PENDING, 1);
- helper.runWithTransaction(db -> db.insert(TABLE_FILES, null, cvPending));
-
- ContentValues cvTrashed = getContentValues(DATE_TAKEN_MS2, GENERATION_MODIFIED2);
- cvTrashed.put(MediaColumns.IS_TRASHED, 1);
- helper.runWithTransaction(db -> db.insert(TABLE_FILES, null, cvTrashed));
-
- try (Cursor cursor = facade.queryMediaId(ID1)) {
- assertThat(cursor.getCount()).isEqualTo(0);
- }
- }
- }
-
- @Test
- public void testQueryMediaId_withDateModified() throws Exception {
- try (DatabaseHelper helper = new TestDatabaseHelper(sIsolatedContext)) {
- ExternalDbFacade facade = new ExternalDbFacade(sIsolatedContext, helper);
-
- long dateModifiedSeconds = DATE_TAKEN_MS1 / 1000;
- ContentValues cv = new ContentValues();
- cv.put(MediaColumns.SIZE, SIZE);
- cv.put(MediaColumns.DATE_MODIFIED, dateModifiedSeconds);
- cv.put(FileColumns.MIME_TYPE, IMAGE_MIME_TYPE);
- cv.put(FileColumns.MEDIA_TYPE, FileColumns.MEDIA_TYPE_VIDEO);
- cv.put(MediaColumns.DURATION, DURATION_MS);
- cv.put(MediaColumns.GENERATION_MODIFIED, GENERATION_MODIFIED1);
- helper.runWithTransaction(db -> db.insert(TABLE_FILES, null, cv));
-
- try (Cursor cursor = facade.queryMediaId(ID1)) {
- assertThat(cursor.getCount()).isEqualTo(1);
-
- cursor.moveToFirst();
- assertMediaColumns(facade, cursor, ID1, dateModifiedSeconds * 1000);
- }
- }
- }
-
- @Test
- public void testQueryMediaId_withFavorite() throws Exception {
- try (DatabaseHelper helper = new TestDatabaseHelper(sIsolatedContext)) {
- ExternalDbFacade facade = new ExternalDbFacade(sIsolatedContext, helper);
-
- ContentValues cv = getContentValues(DATE_TAKEN_MS1, GENERATION_MODIFIED1);
- cv.put(MediaColumns.IS_FAVORITE, 1);
- helper.runWithTransaction(db -> db.insert(TABLE_FILES, null, cv));
-
- try (Cursor cursor = facade.queryMediaId(ID1)) {
- assertThat(cursor.getCount()).isEqualTo(1);
-
- cursor.moveToFirst();
- assertMediaColumns(facade, cursor, ID1, DATE_TAKEN_MS1, /* isFavorite */ 1);
- }
- }
- }
-
- @Test
public void testGetMediaCollectionInfoFiltering() throws Exception {
try (DatabaseHelper helper = new TestDatabaseHelper(sIsolatedContext)) {
ExternalDbFacade facade = new ExternalDbFacade(sIsolatedContext, helper);
@@ -759,7 +682,7 @@
ContentValues cv = getContentValues(DATE_TAKEN_MS1, GENERATION_MODIFIED1);
helper.runWithTransaction(db -> db.insert(TABLE_FILES, null, cv));
- try (Cursor cursor = queryAllMediaGeneration(facade)) {
+ try (Cursor cursor = queryAllMedia(facade)) {
assertThat(cursor.getCount()).isEqualTo(1);
}
@@ -776,7 +699,7 @@
initMediaInAllAlbums(helper);
- try (Cursor cursor = queryAllMediaGeneration(facade)) {
+ try (Cursor cursor = queryAllMedia(facade)) {
assertThat(cursor.getCount()).isEqualTo(5);
}
@@ -842,7 +765,7 @@
cv3.put(FileColumns.MEDIA_TYPE, FileColumns.MEDIA_TYPE_VIDEO);
helper.runWithTransaction(db -> db.insert(TABLE_FILES, null, cv3));
- try (Cursor cursor = queryAllMediaGeneration(facade)) {
+ try (Cursor cursor = queryAllMedia(facade)) {
assertThat(cursor.getCount()).isEqualTo(3);
}
@@ -972,8 +895,8 @@
assertThat(cursor.getLong(generationIndex)).isEqualTo(generation);
}
- private static Cursor queryAllMediaGeneration(ExternalDbFacade facade) {
- return facade.queryMediaGeneration(/* generation */ 0, /* albumId */ null,
+ private static Cursor queryAllMedia(ExternalDbFacade facade) {
+ return facade.queryMedia(/* generation */ 0, /* albumId */ null,
/* mimeType */ null);
}