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

Commit 368d703d authored by Garfield Tan's avatar Garfield Tan Committed by Android (Google) Code Review
Browse files

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

parents 04c0d2b5 92b96ba8

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -32192,6 +32192,7 @@ package android.provider { 














  public final class 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 java.lang.String getVersion(android.content.Context);















    field public static final java.lang.String ACTION_IMAGE_CAPTURE = "android.media.action.IMAGE_CAPTURE";

























api/system-current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -34880,6 +34880,7 @@ package android.provider {



























  public final class 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 java.lang.String getVersion(android.content.Context);















    field public static final java.lang.String ACTION_IMAGE_CAPTURE = "android.media.action.IMAGE_CAPTURE";

























api/test-current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -32278,6 +32278,7 @@ package android.provider {



























  public final class 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 java.lang.String getVersion(android.content.Context);















    field public static final java.lang.String ACTION_IMAGE_CAPTURE = "android.media.action.IMAGE_CAPTURE";

























core/java/android/os/storage/StorageVolume.java



+1
−1




























Original line number
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_PICTURES}, {@link Environment#DIRECTORY_MOVIES},















     *            {@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.















     * @return intent to request access, or {@code null} if the requested directory is invalid for















     *         that volume.

































core/java/android/provider/DocumentsContract.java



+5
−1




























Original line number
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);





























    /** {@hide} */













    public static final String EXTERNAL_STORAGE_PROVIDER_AUTHORITY =













            "com.android.externalstorage.documents";





























    /** {@hide} */















    public static final String PACKAGE_DOCUMENTS_UI = "com.android.documentsui";


























@@ -699,7 +703,7 @@ public final class DocumentsContract {













    public static Uri buildHomeUri() {















        // TODO: Avoid this type of interpackage copying. Added here to avoid















        // direct coupling, but not ideal.













        return DocumentsContract.buildRootUri("com.android.externalstorage.documents", "home");













        return DocumentsContract.buildRootUri(EXTERNAL_STORAGE_PROVIDER_AUTHORITY, "home");















    }































    /**