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

Commit f9ebfc9a authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Helper methods for constructing MediaStore Uris. 

Bug: 128787096
Test: atest MediaProviderTests
Test: atest cts/tests/tests/provider/src/android/provider/cts/MediaStore*
Change-Id: I2848feb616df1c4df0b1bb71544769f61b9d84e8
parent 13d02b59

core/java/android/provider/MediaStore.java

+20 −0
Original line number Diff line number Diff line
@@ -1380,6 +1380,11 @@ public final class MediaStore { 
                    .appendPath("downloads").build();

        }



        /** @hide */

        public static @NonNull Uri getContentUri(@NonNull String volumeName, long id) {

            return ContentUris.withAppendedId(getContentUri(volumeName), id);

        }



        /** @hide */

        public static @NonNull Uri getContentUriForPath(@NonNull String path) {

            return getContentUri(getVolumeName(new File(path)));
@@ -1752,6 +1757,11 @@ public final class MediaStore { 
                        .appendPath("media").build();

            }



            /** @hide */

            public static @NonNull Uri getContentUri(@NonNull String volumeName, long id) {

                return ContentUris.withAppendedId(getContentUri(volumeName), id);

            }



            /**

             * The content:// style URI for the internal storage.

             */
@@ -2240,6 +2250,11 @@ public final class MediaStore { 
                        .appendPath("media").build();

            }



            /** @hide */

            public static @NonNull Uri getContentUri(@NonNull String volumeName, long id) {

                return ContentUris.withAppendedId(getContentUri(volumeName), id);

            }



            /**

             * Get the content:// style URI for the given audio media file.

             *
@@ -3018,6 +3033,11 @@ public final class MediaStore { 
                        .appendPath("media").build();

            }



            /** @hide */

            public static @NonNull Uri getContentUri(@NonNull String volumeName, long id) {

                return ContentUris.withAppendedId(getContentUri(volumeName), id);

            }



            /**

             * The content:// style URI for the internal storage.

             */