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

Commit 37c5c22d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "MediaMetadata: Unhide METADATA_KEY_MEDIA_URI"

parents 244aa21e d7e78137

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

media/java/android/media/MediaMetadata.java

+0 −1
Original line number Diff line number Diff line
@@ -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";