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

Commit b59c6c2d authored by Matt Casey's avatar Matt Casey Committed by Android Git Automerger
Browse files

am ca04d718: Merge "Add a mediastore constant for playlists." 

* commit 'ca04d718':
  Add a mediastore constant for playlists.
parents e7a93296 ca04d718

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -22257,6 +22257,7 @@ package android.provider { 
    field public static final java.lang.String EXTRA_MEDIA_ARTIST = "android.intent.extra.artist";

    field public static final java.lang.String EXTRA_MEDIA_FOCUS = "android.intent.extra.focus";

    field public static final java.lang.String EXTRA_MEDIA_GENRE = "android.intent.extra.genre";

    field public static final java.lang.String EXTRA_MEDIA_PLAYLIST = "android.intent.extra.playlist";

    field public static final java.lang.String EXTRA_MEDIA_RADIO_CHANNEL = "android.intent.extra.radio_channel";

    field public static final java.lang.String EXTRA_MEDIA_TITLE = "android.intent.extra.title";

    field public static final java.lang.String EXTRA_OUTPUT = "output";

core/java/android/provider/MediaStore.java

+4 −0
Original line number Diff line number Diff line
@@ -172,6 +172,10 @@ public final class MediaStore { 
     * The name of the Intent-extra used to define the genre.

     */

    public static final String EXTRA_MEDIA_GENRE = "android.intent.extra.genre";

    /**

     * The name of the Intent-extra used to define the playlist.

     */

    public static final String EXTRA_MEDIA_PLAYLIST = "android.intent.extra.playlist";

    /**

     * The name of the Intent-extra used to define the radio channel.

     */