summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--api/current.txt1
-rw-r--r--api/system-current.txt1
-rw-r--r--api/test-current.txt1
-rw-r--r--media/java/android/media/MediaMetadata.java1
4 files changed, 3 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index 00b59152b339..0a701abe2794 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -21085,6 +21085,7 @@ package android.media {
field public static final java.lang.String METADATA_KEY_DURATION = "android.media.metadata.DURATION";
field public static final java.lang.String METADATA_KEY_GENRE = "android.media.metadata.GENRE";
field public static final java.lang.String METADATA_KEY_MEDIA_ID = "android.media.metadata.MEDIA_ID";
+ field public static final java.lang.String METADATA_KEY_MEDIA_URI = "android.media.metadata.MEDIA_URI";
field public static final java.lang.String METADATA_KEY_NUM_TRACKS = "android.media.metadata.NUM_TRACKS";
field public static final java.lang.String METADATA_KEY_RATING = "android.media.metadata.RATING";
field public static final java.lang.String METADATA_KEY_TITLE = "android.media.metadata.TITLE";
diff --git a/api/system-current.txt b/api/system-current.txt
index 96814b2d36ce..c72f2823a8a9 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -22604,6 +22604,7 @@ package android.media {
field public static final java.lang.String METADATA_KEY_DURATION = "android.media.metadata.DURATION";
field public static final java.lang.String METADATA_KEY_GENRE = "android.media.metadata.GENRE";
field public static final java.lang.String METADATA_KEY_MEDIA_ID = "android.media.metadata.MEDIA_ID";
+ field public static final java.lang.String METADATA_KEY_MEDIA_URI = "android.media.metadata.MEDIA_URI";
field public static final java.lang.String METADATA_KEY_NUM_TRACKS = "android.media.metadata.NUM_TRACKS";
field public static final java.lang.String METADATA_KEY_RATING = "android.media.metadata.RATING";
field public static final java.lang.String METADATA_KEY_TITLE = "android.media.metadata.TITLE";
diff --git a/api/test-current.txt b/api/test-current.txt
index 525c21c02e2d..1e010203be11 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -21155,6 +21155,7 @@ package android.media {
field public static final java.lang.String METADATA_KEY_DURATION = "android.media.metadata.DURATION";
field public static final java.lang.String METADATA_KEY_GENRE = "android.media.metadata.GENRE";
field public static final java.lang.String METADATA_KEY_MEDIA_ID = "android.media.metadata.MEDIA_ID";
+ field public static final java.lang.String METADATA_KEY_MEDIA_URI = "android.media.metadata.MEDIA_URI";
field public static final java.lang.String METADATA_KEY_NUM_TRACKS = "android.media.metadata.NUM_TRACKS";
field public static final java.lang.String METADATA_KEY_RATING = "android.media.metadata.RATING";
field public static final java.lang.String METADATA_KEY_TITLE = "android.media.metadata.TITLE";
diff --git a/media/java/android/media/MediaMetadata.java b/media/java/android/media/MediaMetadata.java
index e96688847533..af26b0aceb7c 100644
--- a/media/java/android/media/MediaMetadata.java
+++ b/media/java/android/media/MediaMetadata.java
@@ -275,7 +275,6 @@ public final class MediaMetadata implements Parcelable {
* {@link MediaController.TransportControls#playFromUri(Uri, Bundle)}
* to initiate playback when provided by a {@link MediaBrowser} connected to
* the same app.
- * @hide
*/
public static final String METADATA_KEY_MEDIA_URI = "android.media.metadata.MEDIA_URI";