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

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

Merge "MediaSession2: Implement playFromXXX and prepareFromXXX"

parents b6fbe829 47b7f2b6

media/java/android/media/MediaController2.java

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ public class MediaController2 implements AutoCloseable { 
     * @param extras Optional extras that can include extra information about the media item

     *               to be played.

     */

    public void playFromUri(@NonNull String uri, @Nullable Bundle extras) {

    public void playFromUri(@NonNull Uri uri, @Nullable Bundle extras) {

        mProvider.playFromUri_impl(uri, extras);

    }

media/java/android/media/MediaSession2.java

+2 −2
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ public class MediaSession2 implements AutoCloseable { 


        /**

         * Called when a controller requested to play a specific media item represented by a URI

         * through {@link MediaController2#playFromUri(String, Bundle)}

         * through {@link MediaController2#playFromUri(Uri, Bundle)}

         *

         * @param controller controller information

         * @param uri uri
@@ -510,7 +510,7 @@ public class MediaSession2 implements AutoCloseable { 
         * @see #COMMAND_CODE_PLAY_FROM_URI

         */

        public void onPlayFromUri(@NonNull ControllerInfo controller,

                @NonNull String uri, @Nullable Bundle extras) { }

                @NonNull Uri uri, @Nullable Bundle extras) { }



        /**

         * Called when a controller requested to prepare for playing a specific mediaId through

media/java/android/media/update/MediaController2Provider.java

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public interface MediaController2Provider extends TransportControlProvider { 
    void prepareFromSearch_impl(String query, Bundle extras);

    void prepareMediaId_impl(String mediaId, Bundle extras);

    void playFromSearch_impl(String query, Bundle extras);

    void playFromUri_impl(String uri, Bundle extras);

    void playFromUri_impl(Uri uri, Bundle extras);

    void playFromMediaId_impl(String mediaId, Bundle extras);



    void setRating_impl(Rating2 rating);