Merge "MediaSession2: Add caller to the callback methods" (247779b3) · Commits · e / os / android_frameworks_base

api/current.txt

+38 −38

Original line number	Diff line number	Diff line
		@@ -22865,12 +22865,12 @@ package android.media {

		public static class MediaBrowser2.BrowserCallback extends android.media.MediaController2.ControllerCallback {
		ctor public MediaBrowser2.BrowserCallback();
		method public void onChildrenChanged(java.lang.String, int, android.os.Bundle);
		method public void onGetChildrenDone(java.lang.String, int, int, java.util.List<android.media.MediaItem2>, android.os.Bundle);
		method public void onGetItemDone(java.lang.String, android.media.MediaItem2);
		method public void onGetLibraryRootDone(android.os.Bundle, java.lang.String, android.os.Bundle);
		method public void onGetSearchResultDone(java.lang.String, int, int, java.util.List<android.media.MediaItem2>, android.os.Bundle);
		method public void onSearchResultChanged(java.lang.String, int, android.os.Bundle);
		method public void onChildrenChanged(android.media.MediaBrowser2, java.lang.String, int, android.os.Bundle);
		method public void onGetChildrenDone(android.media.MediaBrowser2, java.lang.String, int, int, java.util.List<android.media.MediaItem2>, android.os.Bundle);
		method public void onGetItemDone(android.media.MediaBrowser2, java.lang.String, android.media.MediaItem2);
		method public void onGetLibraryRootDone(android.media.MediaBrowser2, android.os.Bundle, java.lang.String, android.os.Bundle);
		method public void onGetSearchResultDone(android.media.MediaBrowser2, java.lang.String, int, int, java.util.List<android.media.MediaItem2>, android.os.Bundle);
		method public void onSearchResultChanged(android.media.MediaBrowser2, java.lang.String, int, android.os.Bundle);
		}

		public final class MediaCas implements java.lang.AutoCloseable {
		@@ -23392,20 +23392,20 @@ package android.media {

		public static abstract class MediaController2.ControllerCallback {
		ctor public MediaController2.ControllerCallback();
		method public void onAllowedCommandsChanged(android.media.MediaSession2.CommandGroup);
		method public void onBufferedPositionChanged(long);
		method public void onConnected(android.media.MediaSession2.CommandGroup);
		method public void onCurrentPlaylistItemChanged(android.media.MediaItem2);
		method public void onCustomCommand(android.media.MediaSession2.Command, android.os.Bundle, android.os.ResultReceiver);
		method public void onCustomLayoutChanged(java.util.List<android.media.MediaSession2.CommandButton>);
		method public void onDisconnected();
		method public void onError(int, android.os.Bundle);
		method public void onPlaybackInfoChanged(android.media.MediaController2.PlaybackInfo);
		method public void onPlaybackSpeedChanged(float);
		method public void onPlayerStateChanged(int);
		method public void onPlaylistChanged(java.util.List<android.media.MediaItem2>);
		method public void onPlaylistParamsChanged(android.media.MediaSession2.PlaylistParams);
		method public void onPositionChanged(long, long);
		method public void onAllowedCommandsChanged(android.media.MediaController2, android.media.MediaSession2.CommandGroup);
		method public void onBufferedPositionChanged(android.media.MediaController2, long);
		method public void onConnected(android.media.MediaController2, android.media.MediaSession2.CommandGroup);
		method public void onCurrentPlaylistItemChanged(android.media.MediaController2, android.media.MediaItem2);
		method public void onCustomCommand(android.media.MediaController2, android.media.MediaSession2.Command, android.os.Bundle, android.os.ResultReceiver);
		method public void onCustomLayoutChanged(android.media.MediaController2, java.util.List<android.media.MediaSession2.CommandButton>);
		method public void onDisconnected(android.media.MediaController2);
		method public void onError(android.media.MediaController2, int, android.os.Bundle);
		method public void onPlaybackInfoChanged(android.media.MediaController2, android.media.MediaController2.PlaybackInfo);
		method public void onPlaybackSpeedChanged(android.media.MediaController2, float);
		method public void onPlayerStateChanged(android.media.MediaController2, int);
		method public void onPlaylistChanged(android.media.MediaController2, java.util.List<android.media.MediaItem2>);
		method public void onPlaylistParamsChanged(android.media.MediaController2, android.media.MediaSession2.PlaylistParams);
		method public void onPositionChanged(android.media.MediaController2, long, long);
		}

		public static final class MediaController2.PlaybackInfo {
		@@ -23874,13 +23874,13 @@ package android.media {

		public static class MediaLibraryService2.MediaLibrarySession.MediaLibrarySessionCallback extends android.media.MediaSession2.SessionCallback {
		ctor public MediaLibraryService2.MediaLibrarySession.MediaLibrarySessionCallback(android.content.Context);
		method public java.util.List<android.media.MediaItem2> onGetChildren(android.media.MediaSession2.ControllerInfo, java.lang.String, int, int, android.os.Bundle);
		method public android.media.MediaItem2 onGetItem(android.media.MediaSession2.ControllerInfo, java.lang.String);
		method public android.media.MediaLibraryService2.LibraryRoot onGetLibraryRoot(android.media.MediaSession2.ControllerInfo, android.os.Bundle);
		method public java.util.List<android.media.MediaItem2> onGetSearchResult(android.media.MediaSession2.ControllerInfo, java.lang.String, int, int, android.os.Bundle);
		method public void onSearch(android.media.MediaSession2.ControllerInfo, java.lang.String, android.os.Bundle);
		method public void onSubscribe(android.media.MediaSession2.ControllerInfo, java.lang.String, android.os.Bundle);
		method public void onUnsubscribe(android.media.MediaSession2.ControllerInfo, java.lang.String);
		method public java.util.List<android.media.MediaItem2> onGetChildren(android.media.MediaLibraryService2.MediaLibrarySession, android.media.MediaSession2.ControllerInfo, java.lang.String, int, int, android.os.Bundle);
		method public android.media.MediaItem2 onGetItem(android.media.MediaLibraryService2.MediaLibrarySession, android.media.MediaSession2.ControllerInfo, java.lang.String);
		method public android.media.MediaLibraryService2.LibraryRoot onGetLibraryRoot(android.media.MediaLibraryService2.MediaLibrarySession, android.media.MediaSession2.ControllerInfo, android.os.Bundle);
		method public java.util.List<android.media.MediaItem2> onGetSearchResult(android.media.MediaLibraryService2.MediaLibrarySession, android.media.MediaSession2.ControllerInfo, java.lang.String, int, int, android.os.Bundle);
		method public void onSearch(android.media.MediaLibraryService2.MediaLibrarySession, android.media.MediaSession2.ControllerInfo, java.lang.String, android.os.Bundle);
		method public void onSubscribe(android.media.MediaLibraryService2.MediaLibrarySession, android.media.MediaSession2.ControllerInfo, java.lang.String, android.os.Bundle);
		method public void onUnsubscribe(android.media.MediaLibraryService2.MediaLibrarySession, android.media.MediaSession2.ControllerInfo, java.lang.String);
		}

		public final class MediaMetadata implements android.os.Parcelable {
		@@ -24968,17 +24968,17 @@ package android.media {

		public static abstract class MediaSession2.SessionCallback {
		ctor public MediaSession2.SessionCallback(android.content.Context);
		method public boolean onCommandRequest(android.media.MediaSession2.ControllerInfo, android.media.MediaSession2.Command);
		method public android.media.MediaSession2.CommandGroup onConnect(android.media.MediaSession2.ControllerInfo);
		method public void onCustomCommand(android.media.MediaSession2.ControllerInfo, android.media.MediaSession2.Command, android.os.Bundle, android.os.ResultReceiver);
		method public void onDisconnected(android.media.MediaSession2.ControllerInfo);
		method public void onPlayFromMediaId(android.media.MediaSession2.ControllerInfo, java.lang.String, android.os.Bundle);
		method public void onPlayFromSearch(android.media.MediaSession2.ControllerInfo, java.lang.String, android.os.Bundle);
		method public void onPlayFromUri(android.media.MediaSession2.ControllerInfo, android.net.Uri, android.os.Bundle);
		method public void onPrepareFromMediaId(android.media.MediaSession2.ControllerInfo, java.lang.String, android.os.Bundle);
		method public void onPrepareFromSearch(android.media.MediaSession2.ControllerInfo, java.lang.String, android.os.Bundle);
		method public void onPrepareFromUri(android.media.MediaSession2.ControllerInfo, android.net.Uri, android.os.Bundle);
		method public void onSetRating(android.media.MediaSession2.ControllerInfo, java.lang.String, android.media.Rating2);
		method public boolean onCommandRequest(android.media.MediaSession2, android.media.MediaSession2.ControllerInfo, android.media.MediaSession2.Command);
		method public android.media.MediaSession2.CommandGroup onConnect(android.media.MediaSession2, android.media.MediaSession2.ControllerInfo);
		method public void onCustomCommand(android.media.MediaSession2, android.media.MediaSession2.ControllerInfo, android.media.MediaSession2.Command, android.os.Bundle, android.os.ResultReceiver);
		method public void onDisconnected(android.media.MediaSession2, android.media.MediaSession2.ControllerInfo);
		method public void onPlayFromMediaId(android.media.MediaSession2, android.media.MediaSession2.ControllerInfo, java.lang.String, android.os.Bundle);
		method public void onPlayFromSearch(android.media.MediaSession2, android.media.MediaSession2.ControllerInfo, java.lang.String, android.os.Bundle);
		method public void onPlayFromUri(android.media.MediaSession2, android.media.MediaSession2.ControllerInfo, android.net.Uri, android.os.Bundle);
		method public void onPrepareFromMediaId(android.media.MediaSession2, android.media.MediaSession2.ControllerInfo, java.lang.String, android.os.Bundle);
		method public void onPrepareFromSearch(android.media.MediaSession2, android.media.MediaSession2.ControllerInfo, java.lang.String, android.os.Bundle);
		method public void onPrepareFromUri(android.media.MediaSession2, android.media.MediaSession2.ControllerInfo, android.net.Uri, android.os.Bundle);
		method public void onSetRating(android.media.MediaSession2, android.media.MediaSession2.ControllerInfo, java.lang.String, android.media.Rating2);
		}

		public abstract class MediaSessionService2 extends android.app.Service {

media/java/android/media/MediaBrowser2.java

+32 −21

Original line number	Diff line number	Diff line
		@@ -46,12 +46,13 @@ public class MediaBrowser2 extends MediaController2 {
		* {@code rootMediaId} and {@code rootExtra} can be {@code null} if the library root isn't
		* available.
		*
		* @param browser the browser for this event
		* @param rootHints rootHints that you previously requested.
		* @param rootMediaId media id of the library root. Can be {@code null}
		* @param rootExtra extra of the library root. Can be {@code null}
		*/
		public void onGetLibraryRootDone(Bundle rootHints, @Nullable String rootMediaId,
		@Nullable Bundle rootExtra) { }
		public void onGetLibraryRootDone(@NonNull MediaBrowser2 browser, @Nullable Bundle rootHints,
		@Nullable String rootMediaId, @Nullable Bundle rootExtra) { }

		/**
		* Called when there's change in the parent's children.
		@@ -60,18 +61,20 @@ public class MediaBrowser2 extends MediaController2 {
		* {@link MediaLibrarySession#notifyChildrenChanged(ControllerInfo, String, int, Bundle)} or
		* {@link MediaLibrarySession#notifyChildrenChanged(String, int, Bundle)} for the parent.
		*
		* @param browser the browser for this event
		* @param parentId parent id that you've specified with {@link #subscribe(String, Bundle)}
		* @param itemCount number of children
		* @param extras extra bundle from the library service. Can be differ from extras that
		* you've specified with {@link #subscribe(String, Bundle)}.
		*/
		public void onChildrenChanged(@NonNull String parentId, int itemCount,
		@Nullable Bundle extras) { }
		public void onChildrenChanged(@NonNull MediaBrowser2 browser, @NonNull String parentId,
		int itemCount, @Nullable Bundle extras) { }

		/**
		* Called when the list of items has been returned by the library service for the previous
		* {@link MediaBrowser2#getChildren(String, int, int, Bundle)}.
		*
		* @param browser the browser for this event
		* @param parentId parent id
		* @param page page number that you've specified with
		* {@link #getChildren(String, int, int, Bundle)}
		@@ -80,8 +83,9 @@ public class MediaBrowser2 extends MediaController2 {
		* @param result result. Can be {@code null}
		* @param extras extra bundle from the library service
		*/
		public void onGetChildrenDone(@NonNull String parentId, int page, int pageSize,
		@Nullable List<MediaItem2> result, @Nullable Bundle extras) { }
		public void onGetChildrenDone(@NonNull MediaBrowser2 browser, @NonNull String parentId,
		int page, int pageSize, @Nullable List<MediaItem2> result,
		@Nullable Bundle extras) { }

		/**
		* Called when the item has been returned by the library service for the previous
		@@ -89,21 +93,24 @@ public class MediaBrowser2 extends MediaController2 {
		* <p>
		* Result can be null if there had been error.
		*
		* @param browser the browser for this event
		* @param mediaId media id
		* @param result result. Can be {@code null}
		*/
		public void onGetItemDone(@NonNull String mediaId, @Nullable MediaItem2 result) { }
		public void onGetItemDone(@NonNull MediaBrowser2 browser, @NonNull String mediaId,
		@Nullable MediaItem2 result) { }

		/**
		* Called when there's change in the search result requested by the previous
		* {@link MediaBrowser2#search(String, Bundle)}.
		*
		* @param browser the browser for this event
		* @param query search query that you've specified with {@link #search(String, Bundle)}
		* @param itemCount The item count for the search result
		* @param extras extra bundle from the library service
		*/
		public void onSearchResultChanged(@NonNull String query, int itemCount,
		@Nullable Bundle extras) { }
		public void onSearchResultChanged(@NonNull MediaBrowser2 browser, @NonNull String query,
		int itemCount, @Nullable Bundle extras) { }

		/**
		* Called when the search result has been returned by the library service for the previous
		@@ -111,6 +118,7 @@ public class MediaBrowser2 extends MediaController2 {
		* <p>
		* Result can be null if there had been error.
		*
		* @param browser the browser for this event
		* @param query search query that you've specified with
		* {@link #getSearchResult(String, int, int, Bundle)}
		* @param page page number that you've specified with
		@@ -120,8 +128,9 @@ public class MediaBrowser2 extends MediaController2 {
		* @param result result. Can be {@code null}.
		* @param extras extra bundle from the library service
		*/
		public void onGetSearchResultDone(@NonNull String query, int page, int pageSize,
		@Nullable List<MediaItem2> result, @Nullable Bundle extras) { }
		public void onGetSearchResultDone(@NonNull MediaBrowser2 browser, @NonNull String query,
		int page, int pageSize, @Nullable List<MediaItem2> result,
		@Nullable Bundle extras) { }
		}

		public MediaBrowser2(@NonNull Context context, @NonNull SessionToken2 token,
		@@ -139,10 +148,10 @@ public class MediaBrowser2 extends MediaController2 {

		/**
		* Get the library root. Result would be sent back asynchronously with the
		* {@link BrowserCallback#onGetLibraryRootDone(Bundle, String, Bundle)}.
		* {@link BrowserCallback#onGetLibraryRootDone(MediaBrowser2, Bundle, String, Bundle)}.
		*
		* @param rootHints hint for the root
		* @see BrowserCallback#onGetLibraryRootDone(Bundle, String, Bundle)
		* @see BrowserCallback#onGetLibraryRootDone(MediaBrowser2, Bundle, String, Bundle)
		*/
		public void getLibraryRoot(Bundle rootHints) {
		mProvider.getLibraryRoot_impl(rootHints);
		@@ -150,9 +159,9 @@ public class MediaBrowser2 extends MediaController2 {

		/**
		* Subscribe to a parent id for the change in its children. When there's a change,
		* {@link BrowserCallback#onChildrenChanged(String, int, Bundle)} will be called with the bundle
		* that you've specified. You should call {@link #getChildren(String, int, int, Bundle)} to get
		* the actual contents for the parent.
		* {@link BrowserCallback#onChildrenChanged(MediaBrowser2, String, int, Bundle)} will be called
		* with the bundle that you've specified. You should call
		* {@link #getChildren(String, int, int, Bundle)} to get the actual contents for the parent.
		*
		* @param parentId parent id
		* @param extras extra bundle
		@@ -176,7 +185,7 @@ public class MediaBrowser2 extends MediaController2 {

		/**
		* Get list of children under the parent. Result would be sent back asynchronously with the
		* {@link BrowserCallback#onGetChildrenDone(String, int, int, List, Bundle)}.
		* {@link BrowserCallback#onGetChildrenDone(MediaBrowser2, String, int, int, List, Bundle)}.
		*
		* @param parentId parent id for getting the children.
		* @param page page number to get the result. Starts from {@code 1}
		@@ -189,7 +198,7 @@ public class MediaBrowser2 extends MediaController2 {

		/**
		* Get the media item with the given media id. Result would be sent back asynchronously with the
		* {@link BrowserCallback#onGetItemDone(String, MediaItem2)}.
		* {@link BrowserCallback#onGetItemDone(MediaBrowser2, String, MediaItem2)}.
		*
		* @param mediaId media id for specifying the item
		*/
		@@ -199,8 +208,9 @@ public class MediaBrowser2 extends MediaController2 {

		/**
		* Send a search request to the library service. When the search result is changed,
		* {@link BrowserCallback#onSearchResultChanged(String, int, Bundle)} will be called. You should
		* call {@link #getSearchResult(String, int, int, Bundle)} to get the actual search result.
		* {@link BrowserCallback#onSearchResultChanged(MediaBrowser2, String, int, Bundle)} will be
		* called. You should call {@link #getSearchResult(String, int, int, Bundle)} to get the actual
		* search result.
		*
		* @param query search query. Should not be an empty string.
		* @param extras extra bundle
		@@ -211,7 +221,8 @@ public class MediaBrowser2 extends MediaController2 {

		/**
		* Get the search result from lhe library service. Result would be sent back asynchronously with
		* the {@link BrowserCallback#onGetSearchResultDone(String, int, int, List, Bundle)}.
		* the
		* {@link BrowserCallback#onGetSearchResultDone(MediaBrowser2, String, int, int, List, Bundle)}.
		*
		* @param query search query that you've specified with {@link #search(String, Bundle)}
		* @param page page number to get search result. Starts from {@code 1}

media/java/android/media/MediaController2.java

+58 −26

File changed.

Preview size limit exceeded, changes collapsed.

media/java/android/media/MediaLibraryService2.java

+29 −19

Original line number	Diff line number	Diff line
		@@ -85,6 +85,7 @@ public abstract class MediaLibraryService2 extends MediaSessionService2 {
		* should return null if the client is not allowed to access this
		* information.
		*
		* @param session the session for this event
		* @param controllerInfo information of the controller requesting access to browse media.
		* @param rootHints An optional bundle of service-specific arguments to send
		* to the media library service when connecting and retrieving the
		@@ -95,8 +96,8 @@ public abstract class MediaLibraryService2 extends MediaSessionService2 {
		* @see LibraryRoot#EXTRA_OFFLINE
		* @see LibraryRoot#EXTRA_SUGGESTED
		*/
		public @Nullable LibraryRoot onGetLibraryRoot(@NonNull ControllerInfo controllerInfo,
		@Nullable Bundle rootHints) {
		public @Nullable LibraryRoot onGetLibraryRoot(@NonNull MediaLibrarySession session,
		@NonNull ControllerInfo controllerInfo, @Nullable Bundle rootHints) {
		return null;
		}

		@@ -105,11 +106,12 @@ public abstract class MediaLibraryService2 extends MediaSessionService2 {
		* <p>
		* Return {@code null} for no result or error.
		*
		* @param session the session for this event
		* @param mediaId item id to get media item.
		* @return a media item. {@code null} for no result or error.
		*/
		public @Nullable MediaItem2 onGetItem(@NonNull ControllerInfo controllerInfo,
		@NonNull String mediaId) {
		public @Nullable MediaItem2 onGetItem(@NonNull MediaLibrarySession session,
		@NonNull ControllerInfo controllerInfo, @NonNull String mediaId) {
		return null;
		}

		@@ -118,14 +120,16 @@ public abstract class MediaLibraryService2 extends MediaSessionService2 {
		* <p>
		* Return an empty list for no children, and return {@code null} for the error.
		*
		* @param session the session for this event
		* @param parentId parent id to get children
		* @param page number of page
		* @param pageSize size of the page
		* @param extras extra bundle
		* @return list of children. Can be {@code null}.
		*/
		public @Nullable List<MediaItem2> onGetChildren(@NonNull ControllerInfo controller,
		@NonNull String parentId, int page, int pageSize, @Nullable Bundle extras) {
		public @Nullable List<MediaItem2> onGetChildren(@NonNull MediaLibrarySession session,
		@NonNull ControllerInfo controller, @NonNull String parentId, int page,
		int pageSize, @Nullable Bundle extras) {
		return null;
		}

		@@ -136,32 +140,37 @@ public abstract class MediaLibraryService2 extends MediaSessionService2 {
		* {@link MediaLibrarySession#notifyChildrenChanged(ControllerInfo, String, int, Bundle)}
		* when the parent is changed.
		*
		* @param session the session for this event
		* @param controller controller
		* @param parentId parent id
		* @param extras extra bundle
		*/
		public void onSubscribe(@NonNull ControllerInfo controller, @NonNull String parentId,
		public void onSubscribe(@NonNull MediaLibrarySession session,
		@NonNull ControllerInfo controller, @NonNull String parentId,
		@Nullable Bundle extras) {
		}

		/**
		* Called when a controller unsubscribes to the parent.
		*
		* @param session the session for this event
		* @param controller controller
		* @param parentId parent id
		*/
		public void onUnsubscribe(@NonNull ControllerInfo controller,
		@NonNull String parentId) {
		public void onUnsubscribe(@NonNull MediaLibrarySession session,
		@NonNull ControllerInfo controller, @NonNull String parentId) {
		}

		/**
		* Called when a controller requests search.
		*
		* @param session the session for this event
		* @param query The search query sent from the media browser. It contains keywords
		* separated by space.
		* @param extras The bundle of service-specific arguments sent from the media browser.
		*/
		public void onSearch(@NonNull ControllerInfo controllerInfo, @NonNull String query,
		public void onSearch(@NonNull MediaLibrarySession session,
		@NonNull ControllerInfo controllerInfo, @NonNull String query,
		@Nullable Bundle extras) {
		}

		@@ -171,17 +180,18 @@ public abstract class MediaLibraryService2 extends MediaSessionService2 {
		* <p>
		* Return an empty list for no search result, and return {@code null} for the error.
		*
		* @param session the session for this event
		* @param controllerInfo Information of the controller requesting the search result.
		* @param query The search query which was previously sent through
		* {@link #onSearch(ControllerInfo, String, Bundle)} call.
		* {@link #onSearch(MediaLibrarySession, ControllerInfo, String, Bundle)}.
		* @param page page number. Starts from {@code 1}.
		* @param pageSize page size. Should be greater or equal to {@code 1}.
		* @param extras The bundle of service-specific arguments sent from the media browser.
		* @return search result. {@code null} for error.
		*/
		public @Nullable List<MediaItem2> onGetSearchResult(
		@NonNull ControllerInfo controllerInfo, @NonNull String query, int page,
		int pageSize, @Nullable Bundle extras) {
		@NonNull MediaLibrarySession session, @NonNull ControllerInfo controllerInfo,
		@NonNull String query, int page, int pageSize, @Nullable Bundle extras) {
		return null;
		}
		}
		@@ -335,8 +345,8 @@ public abstract class MediaLibraryService2 extends MediaSessionService2 {
		* supplied as a root hint for retrieving media items that are recently played.
		* If the media library service can provide such media items, the implementation must return
		* the key in the root hint when
		* {@link MediaLibrarySessionCallback#onGetLibraryRoot(ControllerInfo, Bundle)} is called
		* back.
		* {@link MediaLibrarySessionCallback#onGetLibraryRoot(MediaLibrarySession, ControllerInfo, Bundle)}
		* is called back.
		*
		* <p>The root hint may contain multiple keys.
		*
		@@ -354,8 +364,8 @@ public abstract class MediaLibraryService2 extends MediaSessionService2 {
		* internet connection.
		* If the media library service can provide such media items, the implementation must return
		* the key in the root hint when
		* {@link MediaLibrarySessionCallback#onGetLibraryRoot(ControllerInfo, Bundle)} is called
		* back.
		* {@link MediaLibrarySessionCallback#onGetLibraryRoot(MediaLibrarySession, ControllerInfo, Bundle)}
		* is called back.
		*
		* <p>The root hint may contain multiple keys.
		*
		@@ -374,8 +384,8 @@ public abstract class MediaLibraryService2 extends MediaSessionService2 {
		* suggestion.
		* If the media library service can provide such media items, the implementation must return
		* the key in the root hint when
		* {@link MediaLibrarySessionCallback#onGetLibraryRoot(ControllerInfo, Bundle)} is called
		* back.
		* {@link MediaLibrarySessionCallback#onGetLibraryRoot(MediaLibrarySession, ControllerInfo, Bundle)}
		* is called back.
		*
		* <p>The root hint may contain multiple keys.
		*

media/java/android/media/MediaSession2.java

+57 −39

File changed.

Preview size limit exceeded, changes collapsed.