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

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

Merge "MediaSession2/Controller2: Add playlist support"

parents 81f7471a 15fe6342

media/java/android/media/MediaController2.java

+2 −4
Original line number Diff line number Diff line
@@ -126,11 +126,9 @@ public class MediaController2 implements AutoCloseable { 
        /**

         * Called when the playlist is changed.

         *

         * @param list

         * @param param

         * @param playlist A new playlist set by the session.

         */

        public void onPlaylistChanged(

                @NonNull List<MediaItem2> list, @NonNull PlaylistParams param) { }

        public void onPlaylistChanged(@NonNull List<MediaItem2> playlist) { }



        /**

         * Called when the playback state is changed, or connection success.

media/java/android/media/MediaPlayerInterface.java

+1 −1
Original line number Diff line number Diff line
@@ -64,10 +64,10 @@ public interface MediaPlayerInterface { 
    @Nullable

    AudioAttributes getAudioAttributes();



    void setPlaylist(List<MediaItem2> list, PlaylistParams param);

    void addPlaylistItem(int index, MediaItem2 item);

    void removePlaylistItem(MediaItem2 item);



    void setPlaylist(List<MediaItem2> playlist);

    List<MediaItem2> getPlaylist();



    void setCurrentPlaylistItem(int index);

media/java/android/media/MediaSession2.java

+11 −2
Original line number Diff line number Diff line
@@ -1262,10 +1262,19 @@ public class MediaSession2 implements AutoCloseable { 
        // To match with KEYCODE_MEDIA_SKIP_BACKWARD

    }



    public void setPlaylist(@NonNull List<MediaItem2> playlist, @NonNull PlaylistParams param) {

        mProvider.setPlaylist_impl(playlist, param);

    /**

     * Sets a list of {@link MediaItem2} as the current play list.

     *

     * @param playlist A list of {@link MediaItem2} objects to set as a play list.

     * @throws IllegalArgumentException if given {@param playlist} is null.

     */

    public void setPlaylist(@NonNull List<MediaItem2> playlist) {

        mProvider.setPlaylist_impl(playlist);

    }



    /**

     * Returns the playlist which is lastly set.

     */

    public List<MediaItem2> getPlaylist() {

        return mProvider.getPlaylist_impl();

    }

media/java/android/media/SessionPlayer2.java

+2 −2
Original line number Diff line number Diff line
@@ -97,8 +97,8 @@ public class SessionPlayer2 implements MediaPlayerInterface { 
    }



    @Override

    public void setPlaylist(List<MediaItem2> list, PlaylistParams param) {

        mProvider.setPlaylist_impl(list, param);

    public void setPlaylist(List<MediaItem2> playlist) {

        mProvider.setPlaylist_impl(playlist);

    }



    @Override

media/java/android/media/update/MediaSession2Provider.java

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ public interface MediaSession2Provider extends TransportControlProvider { 
    void sendCustomCommand_impl(ControllerInfo controller, Command command, Bundle args,

            ResultReceiver receiver);

    void sendCustomCommand_impl(Command command, Bundle args);

    void setPlaylist_impl(List<MediaItem2> playlist, PlaylistParams param);

    void setPlaylist_impl(List<MediaItem2> playlist);

    List<MediaItem2> getPlaylist_impl();

    void setPlaylistParams_impl(PlaylistParams params);

    PlaylistParams getPlaylistParams_impl();