Merge "MediaSessionManager: Fix error in listener's nullable annotation" (45b947fd) · Commits · e / os / android_frameworks_base

api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -4311,7 +4311,7 @@ package android.media.session {
		}

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

		public static interface MediaSessionManager.OnMediaKeyEventSessionChangedListener {

+3 −4

Original line number	Diff line number	Diff line
		@@ -940,16 +940,15 @@ public final class MediaSessionManager {
		/**
		* Called when a media key event is dispatched through the media session service. The
		* session token can be {@link null} if the framework has sent the media key event to the
		* media button receiver to revive the media app's playback.
		*
		* the session is dead when , but the framework sent
		* media button receiver to revive the media app's playback after the corresponding session
		* is released.
		*
		* @param event Dispatched media key event.
		* @param packageName Package
		* @param sessionToken The media session's token. Can be {@code null}.
		*/
		default void onMediaKeyEventDispatched(@NonNull KeyEvent event, @NonNull String packageName,
		@NonNull MediaSession.Token sessionToken) { }
		@Nullable MediaSession.Token sessionToken) { }
		}

		/**