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

Commit 92b96ba8 authored by Garfield Tan's avatar Garfield Tan
Browse files

Add internal support to convert a file system path to document URI.

Test: Manual tested with a new sample app in development/samples.

Bug: 30261615
Change-Id: I498a22b248fbc55b33d3efb4aa3183207cfb7bab
parent 78c6b4cf
Loading
Loading
Loading
Loading
+1 −0
Original line number Original line Diff line number Diff line
@@ -32182,6 +32182,7 @@ package android.provider {
  public final class MediaStore {
  public final class MediaStore {
    ctor public MediaStore();
    ctor public MediaStore();
    method public static android.net.Uri getDocumentUri(android.content.Context, android.net.Uri);
    method public static android.net.Uri getMediaScannerUri();
    method public static android.net.Uri getMediaScannerUri();
    method public static java.lang.String getVersion(android.content.Context);
    method public static java.lang.String getVersion(android.content.Context);
    field public static final java.lang.String ACTION_IMAGE_CAPTURE = "android.media.action.IMAGE_CAPTURE";
    field public static final java.lang.String ACTION_IMAGE_CAPTURE = "android.media.action.IMAGE_CAPTURE";
+1 −0
Original line number Original line Diff line number Diff line
@@ -34845,6 +34845,7 @@ package android.provider {
  public final class MediaStore {
  public final class MediaStore {
    ctor public MediaStore();
    ctor public MediaStore();
    method public static android.net.Uri getDocumentUri(android.content.Context, android.net.Uri);
    method public static android.net.Uri getMediaScannerUri();
    method public static android.net.Uri getMediaScannerUri();
    method public static java.lang.String getVersion(android.content.Context);
    method public static java.lang.String getVersion(android.content.Context);
    field public static final java.lang.String ACTION_IMAGE_CAPTURE = "android.media.action.IMAGE_CAPTURE";
    field public static final java.lang.String ACTION_IMAGE_CAPTURE = "android.media.action.IMAGE_CAPTURE";
+1 −0
Original line number Original line Diff line number Diff line
@@ -32268,6 +32268,7 @@ package android.provider {
  public final class MediaStore {
  public final class MediaStore {
    ctor public MediaStore();
    ctor public MediaStore();
    method public static android.net.Uri getDocumentUri(android.content.Context, android.net.Uri);
    method public static android.net.Uri getMediaScannerUri();
    method public static android.net.Uri getMediaScannerUri();
    method public static java.lang.String getVersion(android.content.Context);
    method public static java.lang.String getVersion(android.content.Context);
    field public static final java.lang.String ACTION_IMAGE_CAPTURE = "android.media.action.IMAGE_CAPTURE";
    field public static final java.lang.String ACTION_IMAGE_CAPTURE = "android.media.action.IMAGE_CAPTURE";
+1 −1
Original line number Original line Diff line number Diff line
@@ -332,7 +332,7 @@ public final class StorageVolume implements Parcelable {
     *            {@link Environment#DIRECTORY_ALARMS}, {@link Environment#DIRECTORY_NOTIFICATIONS},
     *            {@link Environment#DIRECTORY_ALARMS}, {@link Environment#DIRECTORY_NOTIFICATIONS},
     *            {@link Environment#DIRECTORY_PICTURES}, {@link Environment#DIRECTORY_MOVIES},
     *            {@link Environment#DIRECTORY_PICTURES}, {@link Environment#DIRECTORY_MOVIES},
     *            {@link Environment#DIRECTORY_DOWNLOADS}, {@link Environment#DIRECTORY_DCIM}, or
     *            {@link Environment#DIRECTORY_DOWNLOADS}, {@link Environment#DIRECTORY_DCIM}, or
     *            {@link Environment#DIRECTORY_DOCUMENTS}, or {code null} to request access to the
     *            {@link Environment#DIRECTORY_DOCUMENTS}, or {@code null} to request access to the
     *            entire volume.
     *            entire volume.
     * @return intent to request access, or {@code null} if the requested directory is invalid for
     * @return intent to request access, or {@code null} if the requested directory is invalid for
     *         that volume.
     *         that volume.
+5 −1
Original line number Original line Diff line number Diff line
@@ -155,6 +155,10 @@ public final class DocumentsContract {
     */
     */
    private static final int THUMBNAIL_BUFFER_SIZE = (int) (128 * KB_IN_BYTES);
    private static final int THUMBNAIL_BUFFER_SIZE = (int) (128 * KB_IN_BYTES);


    /** {@hide} */
    public static final String EXTERNAL_STORAGE_PROVIDER_AUTHORITY =
            "com.android.externalstorage.documents";

    /** {@hide} */
    /** {@hide} */
    public static final String PACKAGE_DOCUMENTS_UI = "com.android.documentsui";
    public static final String PACKAGE_DOCUMENTS_UI = "com.android.documentsui";


@@ -699,7 +703,7 @@ public final class DocumentsContract {
    public static Uri buildHomeUri() {
    public static Uri buildHomeUri() {
        // TODO: Avoid this type of interpackage copying. Added here to avoid
        // TODO: Avoid this type of interpackage copying. Added here to avoid
        // direct coupling, but not ideal.
        // direct coupling, but not ideal.
        return DocumentsContract.buildRootUri("com.android.externalstorage.documents", "home");
        return DocumentsContract.buildRootUri(EXTERNAL_STORAGE_PROVIDER_AUTHORITY, "home");
    }
    }


    /**
    /**
Loading