Merge "Helper methods for constructing MediaStore Uris."
diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java
index 368ba3c..20d3c91 100644
--- a/core/java/android/provider/MediaStore.java
+++ b/core/java/android/provider/MediaStore.java
@@ -1381,6 +1381,11 @@
}
/** @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 @@
.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 @@
.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 @@
.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.
*/