Merge "MediaSessionManager: Apply API review" (3fbf3d60) · Commits · e / os / android_frameworks_base

api/system-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -4484,11 +4484,11 @@ package android.media.session {
		}

		public static interface MediaSessionManager.OnMediaKeyEventDispatchedListener {
		method public default void onMediaKeyEventDispatched(@NonNull android.view.KeyEvent, @NonNull String, @Nullable android.media.session.MediaSession.Token);
		method public void onMediaKeyEventDispatched(@NonNull android.view.KeyEvent, @NonNull String, @Nullable android.media.session.MediaSession.Token);
		}

		public static interface MediaSessionManager.OnMediaKeyEventSessionChangedListener {
		method public default void onMediaKeyEventSessionChanged(@NonNull String, @Nullable android.media.session.MediaSession.Token);
		method public void onMediaKeyEventSessionChanged(@NonNull String, @Nullable android.media.session.MediaSession.Token);
		}

		public static interface MediaSessionManager.OnMediaKeyListener {

media/java/android/media/session/MediaSessionManager.java

+10 −9

Original line number	Diff line number	Diff line
		@@ -932,7 +932,7 @@ public final class MediaSessionManager {
		}

		/**
		* Listener to receive when the media session service
		* Listener to be called when the media session service dispatches a media key event.
		* @hide
		*/
		@SystemApi
		@@ -944,15 +944,15 @@ public final class MediaSessionManager {
		* is released.
		*
		* @param event Dispatched media key event.
		* @param packageName Package
		* @param packageName The package name
		* @param sessionToken The media session's token. Can be {@code null}.
		*/
		default void onMediaKeyEventDispatched(@NonNull KeyEvent event, @NonNull String packageName,
		@Nullable MediaSession.Token sessionToken) { }
		void onMediaKeyEventDispatched(@NonNull KeyEvent event, @NonNull String packageName,
		@Nullable MediaSession.Token sessionToken);
		}

		/**
		* Listener to receive changes in the media key event session, which would receive the media key
		* Listener to receive changes in the media key event session, which would receive a media key
		* event unless specified.
		* @hide
		*/
		@@ -964,13 +964,14 @@ public final class MediaSessionManager {
		* has specified the target.
		* <p>
		* The session token can be {@link null} if the media button session is unset. In that case,
		* framework would dispatch to the last sessions's media button receiver.
		* framework would dispatch to the last sessions's media button receiver. If the media
		* button receive isn't set as well, then it
		*
		* @param packageName The package name who would receive the media key event. Can be empty.
		* @param sessionToken The media session's token. Can be {@code null.}
		* @param sessionToken The media session's token. Can be {@code null}.
		*/
		default void onMediaKeyEventSessionChanged(@NonNull String packageName,
		@Nullable MediaSession.Token sessionToken) { }
		void onMediaKeyEventSessionChanged(@NonNull String packageName,
		@Nullable MediaSession.Token sessionToken);
		}

		/**