Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04b4ba1e authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Jeff Sharkey
Browse files

Shuffling to prepare for MediaProvider APEX. 

An upcoming change will move MediaStore to be within the recently
created MediaProvider APEX.  This means that MediaStore will need to
be fully built against @SystemApi, and so this CL adjusts APIs to
support a clean transition:

-- Listing of "recent" storage volumes and scan paths for "internal"
storage is now handled by StorageManager directly, so that partners
retain control over what is deemed recent.
-- StorageVolume now returns the MediaStore volume name and the
filesystem directory where its contents are presented to apps.
-- Conversion of legacy thumbnail "kind" values to dimensions now
happens directly inside MediaStore.
-- PendingParams and PendingSession are completely removed.
-- Contributed media APIs are completely removed.
-- Media for demo users is now surfaced as a unique StorageVolume.
-- Migrate most MediaStore APIs to accept ContentResolver, which
supports easy usage of ContentResolver.wrap().

Bug: 144247087, 137890034
Test: atest --test-mapping packages/providers/MediaProvider
Exempt-From-Owner-Approval: in-place refactoring
Change-Id: I445528b2779bb37b9f2558e67a3cfc9f60412092
parent cd880e95

api/current.txt

+7 −1
Original line number Diff line number Diff line
@@ -36025,7 +36025,8 @@ package android.os.storage { 
    method @WorkerThread public long getCacheSizeBytes(@NonNull java.util.UUID) throws java.io.IOException;

    method public String getMountedObbPath(String);

    method @NonNull public android.os.storage.StorageVolume getPrimaryStorageVolume();

    method @Nullable public android.os.storage.StorageVolume getStorageVolume(java.io.File);

    method @NonNull public java.util.List<android.os.storage.StorageVolume> getRecentStorageVolumes();

    method @Nullable public android.os.storage.StorageVolume getStorageVolume(@NonNull java.io.File);

    method @NonNull public android.os.storage.StorageVolume getStorageVolume(@NonNull android.net.Uri);

    method @NonNull public java.util.List<android.os.storage.StorageVolume> getStorageVolumes();

    method @NonNull public java.util.UUID getUuidForPath(@NonNull java.io.File) throws java.io.IOException;
@@ -36051,6 +36052,8 @@ package android.os.storage { 
    method @NonNull public android.content.Intent createOpenDocumentTreeIntent();

    method public int describeContents();

    method public String getDescription(android.content.Context);

    method @Nullable public java.io.File getDirectory();

    method @Nullable public String getMediaStoreVolumeName();

    method public String getState();

    method @Nullable public String getUuid();

    method public boolean isEmulated();
@@ -38721,6 +38724,7 @@ package android.provider { 
    method @NonNull public static java.util.Set<java.lang.String> getExternalVolumeNames(@NonNull android.content.Context);

    method public static android.net.Uri getMediaScannerUri();

    method @Nullable public static android.net.Uri getMediaUri(@NonNull android.content.Context, @NonNull android.net.Uri);

    method @NonNull public static java.util.Set<java.lang.String> getRecentExternalVolumeNames(@NonNull android.content.Context);

    method public static boolean getRequireOriginal(@NonNull android.net.Uri);

    method @NonNull public static String getVersion(@NonNull android.content.Context);

    method @NonNull public static String getVersion(@NonNull android.content.Context, @NonNull String);
@@ -38986,6 +38990,7 @@ package android.provider { 
    method @Deprecated public static void cancelThumbnailRequest(android.content.ContentResolver, long);

    method @Deprecated public static void cancelThumbnailRequest(android.content.ContentResolver, long, long);

    method @Deprecated public static android.net.Uri getContentUri(String);

    method @Deprecated @NonNull public static android.util.Size getKindSize(int);

    method @Deprecated public static android.graphics.Bitmap getThumbnail(android.content.ContentResolver, long, int, android.graphics.BitmapFactory.Options);

    method @Deprecated public static android.graphics.Bitmap getThumbnail(android.content.ContentResolver, long, long, int, android.graphics.BitmapFactory.Options);

    method @Deprecated public static final android.database.Cursor query(android.content.ContentResolver, android.net.Uri, String[]);
@@ -39068,6 +39073,7 @@ package android.provider { 
    method @Deprecated public static void cancelThumbnailRequest(android.content.ContentResolver, long);

    method @Deprecated public static void cancelThumbnailRequest(android.content.ContentResolver, long, long);

    method @Deprecated public static android.net.Uri getContentUri(String);

    method @Deprecated @NonNull public static android.util.Size getKindSize(int);

    method @Deprecated public static android.graphics.Bitmap getThumbnail(android.content.ContentResolver, long, int, android.graphics.BitmapFactory.Options);

    method @Deprecated public static android.graphics.Bitmap getThumbnail(android.content.ContentResolver, long, long, int, android.graphics.BitmapFactory.Options);

    field @Deprecated public static final String DATA = "_data";

api/removed.txt

+0 −18
Original line number Diff line number Diff line
@@ -436,10 +436,8 @@ package android.provider { 
  }



  public final class MediaStore {

    method @Deprecated @NonNull public static android.net.Uri createPending(@NonNull android.content.Context, @NonNull android.provider.MediaStore.PendingParams);

    method @Deprecated @NonNull public static java.util.Set<java.lang.String> getAllVolumeNames(@NonNull android.content.Context);

    method @Deprecated public static boolean getIncludePending(@NonNull android.net.Uri);

    method @Deprecated @NonNull public static android.provider.MediaStore.PendingSession openPending(@NonNull android.content.Context, @NonNull android.net.Uri);

    method @Deprecated @NonNull public static android.net.Uri setIncludeTrashed(@NonNull android.net.Uri);

    method @Deprecated public static void trash(@NonNull android.content.Context, @NonNull android.net.Uri);

    method @Deprecated public static void trash(@NonNull android.content.Context, @NonNull android.net.Uri, long);
@@ -473,22 +471,6 @@ package android.provider { 
    field @Deprecated public static final String GROUP_ID = "group_id";

  }



  @Deprecated public static class MediaStore.PendingParams {

    ctor public MediaStore.PendingParams(@NonNull android.net.Uri, @NonNull String, @NonNull String);

    method public void setDownloadUri(@Nullable android.net.Uri);

    method public void setRefererUri(@Nullable android.net.Uri);

    method public void setRelativePath(@Nullable String);

  }



  @Deprecated public static class MediaStore.PendingSession implements java.lang.AutoCloseable {

    method public void abandon();

    method public void close();

    method public void notifyProgress(@IntRange(from=0, to=100) int);

    method @NonNull public android.os.ParcelFileDescriptor open() throws java.io.FileNotFoundException;

    method @NonNull public java.io.OutputStream openOutputStream() throws java.io.FileNotFoundException;

    method @NonNull public android.net.Uri publish();

  }



  public static interface MediaStore.Video.VideoColumns extends android.provider.MediaStore.MediaColumns {

    field public static final String ALBUM = "album";

    field public static final String ARTIST = "artist";

api/system-current.txt

+3 −2
Original line number Diff line number Diff line
@@ -6365,6 +6365,7 @@ package android.os { 
  }















  public class Environment {













    method @NonNull public static java.util.Collection<java.io.File> getInternalMediaDirectories();















    method @NonNull public static java.io.File getOdmDirectory();















    method @NonNull public static java.io.File getOemDirectory();















    method @NonNull public static java.io.File getProductDirectory();










@@ -7253,8 +7254,8 @@ package android.provider {













  }





























  public final class MediaStore {













    method @NonNull @RequiresPermission(android.Manifest.permission.WRITE_MEDIA_STORAGE) public static java.util.Set<java.lang.String> getRecentExternalVolumeNames(@NonNull android.content.Context);













    method @NonNull @RequiresPermission(android.Manifest.permission.WRITE_MEDIA_STORAGE) public static java.util.Collection<java.io.File> getVolumeScanPaths(@NonNull String) throws java.io.FileNotFoundException;













    method @NonNull public static android.net.Uri scanFile(@NonNull android.content.ContentResolver, @NonNull java.io.File);













    method public static void scanVolume(@NonNull android.content.ContentResolver, @NonNull String);















  }





























  public abstract class SearchIndexableData {

































api/test-current.txt



+3
−8




























Original line number
Diff line number
Diff line








@@ -2467,14 +2467,9 @@ package android.provider {













  }































  public final class MediaStore {













    method @RequiresPermission(android.Manifest.permission.CLEAR_APP_USER_DATA) public static void deleteContributedMedia(android.content.Context, String, android.os.UserHandle) throws java.io.IOException;













    method @RequiresPermission(android.Manifest.permission.CLEAR_APP_USER_DATA) public static long getContributedMediaSize(android.content.Context, String, android.os.UserHandle) throws java.io.IOException;













    method @NonNull public static java.io.File getVolumePath(@NonNull String) throws java.io.FileNotFoundException;













    method @NonNull @RequiresPermission(android.Manifest.permission.WRITE_MEDIA_STORAGE) public static java.util.Collection<java.io.File> getVolumeScanPaths(@NonNull String) throws java.io.FileNotFoundException;













    method public static android.net.Uri scanFile(android.content.Context, java.io.File);













    method public static android.net.Uri scanFileFromShell(android.content.Context, java.io.File);













    method public static void scanVolume(android.content.Context, java.io.File);













    method public static void waitForIdle(android.content.Context);













    method @NonNull public static android.net.Uri scanFile(@NonNull android.content.ContentResolver, @NonNull java.io.File);













    method public static void scanVolume(@NonNull android.content.ContentResolver, @NonNull String);













    method public static void waitForIdle(@NonNull android.content.ContentResolver);















  }































  public final class Settings {

































core/java/android/app/DownloadManager.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -1314,8 +1314,8 @@ public class DownloadManager {





























        // TODO: DownloadProvider.update() should take care of updating corresponding















        // MediaProvider entries.













        MediaStore.scanFile(context, before);













        MediaStore.scanFile(context, after);













        MediaStore.scanFile(mResolver, before);













        MediaStore.scanFile(mResolver, after);































        final ContentValues values = new ContentValues();















        values.put(Downloads.Impl.COLUMN_TITLE, displayName);