From e32fa0db4a8ca2d0c981c20ac3fe2d9d073377c1 Mon Sep 17 00:00:00 2001 From: Jaewan Kim Date: Tue, 20 Mar 2018 17:06:01 +0900 Subject: [PATCH] MediaSession2: Revisit command code Bug: 74648408 Test: Build Change-Id: I0c66d6dec7f5a25bd4c36aa6e2c140951ea38855 --- media/java/android/media/MediaSession2.java | 66 +++++++++++++-------- 1 file changed, 40 insertions(+), 26 deletions(-) diff --git a/media/java/android/media/MediaSession2.java b/media/java/android/media/MediaSession2.java index d902671d01548..2d64fcd57854c 100644 --- a/media/java/android/media/MediaSession2.java +++ b/media/java/android/media/MediaSession2.java @@ -116,18 +116,20 @@ public class MediaSession2 implements AutoCloseable { /** * Command code for {@link MediaController2#skipToNextItem()}. *

- * Command would be sent directly to the player if the session doesn't reject the request - * through the {@link SessionCallback#onCommandRequest(MediaSession2, ControllerInfo, Command)}. + * Command would be sent directly to the playlist agent if the session doesn't reject the + * request through the {@link SessionCallback#onCommandRequest( + * MediaSession2, ControllerInfo, Command)}. */ - public static final int COMMAND_CODE_PLAYBACK_SKIP_NEXT_ITEM = 4; + public static final int COMMAND_CODE_PLAYLIST_SKIP_NEXT_ITEM = 4; /** * Command code for {@link MediaController2#skipToPreviousItem()}. *

- * Command would be sent directly to the player if the session doesn't reject the request - * through the {@link SessionCallback#onCommandRequest(MediaSession2, ControllerInfo, Command)}. + * Command would be sent directly to the playlist agent if the session doesn't reject the + * request through the {@link SessionCallback#onCommandRequest( + * MediaSession2, ControllerInfo, Command)}. */ - public static final int COMMAND_CODE_PLAYBACK_SKIP_PREV_ITEM = 5; + public static final int COMMAND_CODE_PLAYLIST_SKIP_PREV_ITEM = 5; /** * Command code for {@link MediaController2#prepare()}. @@ -275,48 +277,60 @@ public class MediaSession2 implements AutoCloseable { /** * Command code for {@link MediaController2#playFromMediaId(String, Bundle)}. */ - public static final int COMMAND_CODE_PLAY_FROM_MEDIA_ID = 22; + public static final int COMMAND_CODE_SESSION_PLAY_FROM_MEDIA_ID = 22; /** * Command code for {@link MediaController2#playFromUri(Uri, Bundle)}. */ - public static final int COMMAND_CODE_PLAY_FROM_URI = 23; + public static final int COMMAND_CODE_SESSION_PLAY_FROM_URI = 23; /** * Command code for {@link MediaController2#playFromSearch(String, Bundle)}. */ - public static final int COMMAND_CODE_PLAY_FROM_SEARCH = 24; + public static final int COMMAND_CODE_SESSION_PLAY_FROM_SEARCH = 24; /** * Command code for {@link MediaController2#prepareFromMediaId(String, Bundle)}. */ - public static final int COMMAND_CODE_PREPARE_FROM_MEDIA_ID = 25; + public static final int COMMAND_CODE_SESSION_PREPARE_FROM_MEDIA_ID = 25; /** * Command code for {@link MediaController2#prepareFromUri(Uri, Bundle)}. */ - public static final int COMMAND_CODE_PREPARE_FROM_URI = 26; + public static final int COMMAND_CODE_SESSION_PREPARE_FROM_URI = 26; /** * Command code for {@link MediaController2#prepareFromSearch(String, Bundle)}. */ - public static final int COMMAND_CODE_PREPARE_FROM_SEARCH = 27; + public static final int COMMAND_CODE_SESSION_PREPARE_FROM_SEARCH = 27; /** * Command code for {@link MediaController2#setRating(String, Rating2)}. * @hide */ - // TODO(jaewan): Unhide - public static final int COMMAND_CODE_SET_RATING = 29; + public static final int COMMAND_CODE_SESSION_SET_RATING = 28; /** - * Command code for {@link MediaBrowser2} specific functions that allows navigation and search - * from the {@link MediaLibraryService2}. This would be ignored for a {@link MediaSession2}, - * not {@link android.media.MediaLibraryService2.MediaLibrarySession}. + * Command code for {@link android.media.MediaLibraryService2.MediaLibrarySession} specific + * functions. With or without this, a {@link MediaSession2} that isn't + * {@link android.media.MediaLibraryService2.MediaLibrarySession} would automatically reject + * the calls. * + * @see android.media.MediaLibraryService2.MediaLibrarySession * @see MediaBrowser2 + * @hide */ - public static final int COMMAND_CODE_BROWSER = 28; + // TODO(jaewan): Remove + public static final int COMMAND_CODE_BROWSER = 29; + + // TODO(jaewan): Add javadoc + public static final int COMMAND_CODE_LIBRARY_GET_CHILDREN = 29; + public static final int COMMAND_CODE_LIBRARY_GET_ITEM = 30; + public static final int COMMAND_CODE_LIBRARY_GET_LIBRARY_ROOT = 31; + public static final int COMMAND_CODE_LIBRARY_GET_SEARCH_RESULT = 32; + public static final int COMMAND_CODE_LIBRARY_SEARCH = 33; + public static final int COMMAND_CODE_LIBRARY_SUBSCRIBE = 34; + public static final int COMMAND_CODE_LIBRARY_UNSUBSCRIBE = 35; /** * @hide @@ -619,8 +633,8 @@ public class MediaSession2 implements AutoCloseable { * @see #COMMAND_CODE_PLAYBACK_PLAY * @see #COMMAND_CODE_PLAYBACK_PAUSE * @see #COMMAND_CODE_PLAYBACK_STOP - * @see #COMMAND_CODE_PLAYBACK_SKIP_NEXT_ITEM - * @see #COMMAND_CODE_PLAYBACK_SKIP_PREV_ITEM + * @see #COMMAND_CODE_PLAYLIST_SKIP_NEXT_ITEM + * @see #COMMAND_CODE_PLAYLIST_SKIP_PREV_ITEM * @see #COMMAND_CODE_PLAYBACK_PREPARE * @see #COMMAND_CODE_PLAYBACK_FAST_FORWARD * @see #COMMAND_CODE_PLAYBACK_REWIND @@ -675,7 +689,7 @@ public class MediaSession2 implements AutoCloseable { * @param controller controller information * @param mediaId media id * @param extras optional extra bundle - * @see #COMMAND_CODE_PLAY_FROM_MEDIA_ID + * @see #COMMAND_CODE_SESSION_PLAY_FROM_MEDIA_ID */ public void onPlayFromMediaId(@NonNull MediaSession2 session, @NonNull ControllerInfo controller, @NonNull String mediaId, @@ -692,7 +706,7 @@ public class MediaSession2 implements AutoCloseable { * @param controller controller information * @param query query string. Can be empty to indicate any suggested media * @param extras optional extra bundle - * @see #COMMAND_CODE_PLAY_FROM_SEARCH + * @see #COMMAND_CODE_SESSION_PLAY_FROM_SEARCH */ public void onPlayFromSearch(@NonNull MediaSession2 session, @NonNull ControllerInfo controller, @NonNull String query, @@ -706,7 +720,7 @@ public class MediaSession2 implements AutoCloseable { * @param controller controller information * @param uri uri * @param extras optional extra bundle - * @see #COMMAND_CODE_PLAY_FROM_URI + * @see #COMMAND_CODE_SESSION_PLAY_FROM_URI */ public void onPlayFromUri(@NonNull MediaSession2 session, @NonNull ControllerInfo controller, @NonNull Uri uri, @@ -730,7 +744,7 @@ public class MediaSession2 implements AutoCloseable { * @param controller controller information * @param mediaId media id to prepare * @param extras optional extra bundle - * @see #COMMAND_CODE_PREPARE_FROM_MEDIA_ID + * @see #COMMAND_CODE_SESSION_PREPARE_FROM_MEDIA_ID */ public void onPrepareFromMediaId(@NonNull MediaSession2 session, @NonNull ControllerInfo controller, @NonNull String mediaId, @@ -754,7 +768,7 @@ public class MediaSession2 implements AutoCloseable { * @param controller controller information * @param query query string. Can be empty to indicate any suggested media * @param extras optional extra bundle - * @see #COMMAND_CODE_PREPARE_FROM_SEARCH + * @see #COMMAND_CODE_SESSION_PREPARE_FROM_SEARCH */ public void onPrepareFromSearch(@NonNull MediaSession2 session, @NonNull ControllerInfo controller, @NonNull String query, @@ -778,7 +792,7 @@ public class MediaSession2 implements AutoCloseable { * @param controller controller information * @param uri uri * @param extras optional extra bundle - * @see #COMMAND_CODE_PREPARE_FROM_URI + * @see #COMMAND_CODE_SESSION_PREPARE_FROM_URI */ public void onPrepareFromUri(@NonNull MediaSession2 session, @NonNull ControllerInfo controller, @NonNull Uri uri, @Nullable Bundle extras) { }