diff options
4 files changed, 12 insertions, 5 deletions
diff --git a/media/java/android/media/IMediaSession2.aidl b/media/java/android/media/IMediaSession2.aidl index 3783e5fd94e4..9474154b0b28 100644 --- a/media/java/android/media/IMediaSession2.aidl +++ b/media/java/android/media/IMediaSession2.aidl @@ -41,7 +41,7 @@ oneway interface IMediaSession2 { ////////////////////////////////////////////////////////////////////////////////////////////// void sendCommand(IMediaSession2Callback caller, in Bundle command, in Bundle args); void sendTransportControlCommand(IMediaSession2Callback caller, - int commandCode, long arg); + int commandCode, in Bundle args); ////////////////////////////////////////////////////////////////////////////////////////////// // Get library service specific diff --git a/media/java/android/media/MediaController2.java b/media/java/android/media/MediaController2.java index a8b2411a9013..c60a689fe6f5 100644 --- a/media/java/android/media/MediaController2.java +++ b/media/java/android/media/MediaController2.java @@ -599,9 +599,13 @@ public class MediaController2 implements AutoCloseable { return mProvider.getPlaylist_impl(); } - public @Nullable - PlaylistParams getPlaylistParam() { - return mProvider.getPlaylistParam_impl(); + /** + * Returns the {@link PlaylistParams} for the current play list. + * Can return {@code null} if the controller doesn't have enough permission, or if the session + * has not set the parameters. + */ + public @Nullable PlaylistParams getPlaylistParams() { + return mProvider.getPlaylistParams_impl(); } /** diff --git a/media/java/android/media/MediaSession2.java b/media/java/android/media/MediaSession2.java index 245ba3b5f65d..5b2fff1a6fc7 100644 --- a/media/java/android/media/MediaSession2.java +++ b/media/java/android/media/MediaSession2.java @@ -108,6 +108,8 @@ public class MediaSession2 implements AutoCloseable { public static final int COMMAND_CODE_PREPARE_FROM_URI = 18; public static final int COMMAND_CODE_PREPARE_FROM_SEARCH = 19; + public static final int COMMAND_CODE_PLAYBACK_SET_PLAYLIST_PARAMS = 20; + /** * Define a command that a {@link MediaController2} can send to a {@link MediaSession2}. * <p> @@ -237,6 +239,7 @@ public class MediaSession2 implements AutoCloseable { mCommands.add(new Command(COMMAND_CODE_PLAYBACK_REWIND)); mCommands.add(new Command(COMMAND_CODE_PLAYBACK_SEEK_TO)); mCommands.add(new Command(COMMAND_CODE_PLAYBACK_SET_CURRENT_PLAYLIST_ITEM)); + mCommands.add(new Command(COMMAND_CODE_PLAYBACK_SET_PLAYLIST_PARAMS)); } public void removeCommand(Command command) { diff --git a/media/java/android/media/update/MediaController2Provider.java b/media/java/android/media/update/MediaController2Provider.java index b72fda94c688..05790c113804 100644 --- a/media/java/android/media/update/MediaController2Provider.java +++ b/media/java/android/media/update/MediaController2Provider.java @@ -62,7 +62,7 @@ public interface MediaController2Provider extends TransportControlProvider { void removePlaylistItem_impl(MediaItem2 index); void addPlaylistItem_impl(int index, MediaItem2 item); - PlaylistParams getPlaylistParam_impl(); + PlaylistParams getPlaylistParams_impl(); void setPlaylistParams_impl(PlaylistParams params); PlaybackState2 getPlaybackState_impl(); } |