Merge "Helper methods for constructing MediaStore Uris." (788f9d38) · Commits · e / os / android_frameworks_base

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.
		*/