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

Commit a130c1a7 authored by P.Y. Laligand's avatar P.Y. Laligand Committed by Android (Google) Code Review
Browse files

Merge "Added MediaController.TransportControls#playFromUri."

parents 26c44eee c2045470

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -17062,6 +17062,7 @@ package android.media.session { 
    method public void play();

    method public void playFromMediaId(java.lang.String, android.os.Bundle);

    method public void playFromSearch(java.lang.String, android.os.Bundle);

    method public void playFromUri(android.net.Uri, android.os.Bundle);

    method public void rewind();

    method public void seekTo(long);

    method public void sendCustomAction(android.media.session.PlaybackState.CustomAction, android.os.Bundle);
@@ -17109,6 +17110,7 @@ package android.media.session { 
    method public void onPlay();

    method public void onPlayFromMediaId(java.lang.String, android.os.Bundle);

    method public void onPlayFromSearch(java.lang.String, android.os.Bundle);

    method public void onPlayFromUri(android.net.Uri, android.os.Bundle);

    method public void onRewind();

    method public void onSeekTo(long);

    method public void onSetRating(android.media.Rating);
@@ -17163,6 +17165,7 @@ package android.media.session { 
    field public static final long ACTION_PLAY = 4L; // 0x4L

    field public static final long ACTION_PLAY_FROM_MEDIA_ID = 1024L; // 0x400L

    field public static final long ACTION_PLAY_FROM_SEARCH = 2048L; // 0x800L

    field public static final long ACTION_PLAY_FROM_URI = 8192L; // 0x2000L

    field public static final long ACTION_PLAY_PAUSE = 512L; // 0x200L

    field public static final long ACTION_REWIND = 8L; // 0x8L

    field public static final long ACTION_SEEK_TO = 256L; // 0x100L

api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -18327,6 +18327,7 @@ package android.media.session { 
    method public void play();

    method public void playFromMediaId(java.lang.String, android.os.Bundle);

    method public void playFromSearch(java.lang.String, android.os.Bundle);

    method public void playFromUri(android.net.Uri, android.os.Bundle);

    method public void rewind();

    method public void seekTo(long);

    method public void sendCustomAction(android.media.session.PlaybackState.CustomAction, android.os.Bundle);
@@ -18374,6 +18375,7 @@ package android.media.session { 
    method public void onPlay();

    method public void onPlayFromMediaId(java.lang.String, android.os.Bundle);

    method public void onPlayFromSearch(java.lang.String, android.os.Bundle);

    method public void onPlayFromUri(android.net.Uri, android.os.Bundle);

    method public void onRewind();

    method public void onSeekTo(long);

    method public void onSetRating(android.media.Rating);
@@ -18428,6 +18430,7 @@ package android.media.session { 
    field public static final long ACTION_PLAY = 4L; // 0x4L

    field public static final long ACTION_PLAY_FROM_MEDIA_ID = 1024L; // 0x400L

    field public static final long ACTION_PLAY_FROM_SEARCH = 2048L; // 0x800L

    field public static final long ACTION_PLAY_FROM_URI = 8192L; // 0x2000L

    field public static final long ACTION_PLAY_PAUSE = 512L; // 0x200L

    field public static final long ACTION_REWIND = 8L; // 0x8L

    field public static final long ACTION_SEEK_TO = 256L; // 0x100L

media/java/android/media/session/ISessionCallback.aidl

+3 −2
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 


package android.media.session;



import android.media.Rating;

import android.content.Intent;

import android.media.Rating;

import android.net.Uri;

import android.os.Bundle;

import android.os.ResultReceiver;
@@ -30,8 +30,9 @@ oneway interface ISessionCallback { 


    // These callbacks are for the TransportPerformer

    void onPlay();

    void onPlayFromMediaId(String uri, in Bundle extras);

    void onPlayFromMediaId(String mediaId, in Bundle extras);

    void onPlayFromSearch(String query, in Bundle extras);

    void onPlayFromUri(in Uri uri, in Bundle extras);

    void onSkipToTrack(long id);

    void onPause();

    void onStop();

media/java/android/media/session/ISessionController.aidl

+3 −2
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ import android.media.Rating; 
import android.media.routing.IMediaRouterDelegate;

import android.media.routing.IMediaRouterStateCallback;

import android.media.session.ISessionControllerCallback;

import android.media.session.MediaSession;

import android.media.session.ParcelableVolumeInfo;

import android.media.session.PlaybackState;

import android.media.session.MediaSession;

import android.net.Uri;

import android.os.Bundle;

import android.os.ResultReceiver;
@@ -55,8 +55,9 @@ interface ISessionController { 


    // These commands are for the TransportControls

    void play();

    void playFromMediaId(String uri, in Bundle extras);

    void playFromMediaId(String mediaId, in Bundle extras);

    void playFromSearch(String string, in Bundle extras);

    void playFromUri(in Uri uri, in Bundle extras);

    void skipToQueueItem(long id);

    void pause();

    void stop();

media/java/android/media/session/MediaController.java

+21 −2
Original line number Diff line number Diff line
@@ -615,9 +615,9 @@ public final class MediaController { 
        }



        /**

         * Request that the player start playback for a specific {@link Uri}.

         * Request that the player start playback for a specific media id.

         *

         * @param mediaId The uri of the requested media.

         * @param mediaId The id of the requested media.

         * @param extras Optional extras that can include extra information about the media item

         *               to be played.

         */
@@ -655,6 +655,25 @@ public final class MediaController { 
            }

        }



        /**

         * Request that the player start playback for a specific {@link Uri}.

         *

         * @param uri  The URI of the requested media.

         * @param extras Optional extras that can include extra information about the media item

         *               to be played.

         */

        public void playFromUri(Uri uri, Bundle extras) {

            if (uri == null || Uri.EMPTY.equals(uri)) {

                throw new IllegalArgumentException(

                        "You must specify a non-empty Uri for playFromUri.");

            }

            try {

                mSessionBinder.playFromUri(uri, extras);

            } catch (RemoteException e) {

                Log.wtf(TAG, "Error calling play(" + uri + ").", e);

            }

        }



        /**

         * Play an item with a specific id in the play queue. If you specify an

         * id that is not in the play queue, the behavior is undefined.