Merge "Deprecate MediaSesson2 related methods in MediaSessionManager" into main (a5896ed0) · Commits · e / os / android_frameworks_base

core/api/current.txt

+6 −6

Original line number	Diff line number	Diff line
		@@ -28034,17 +28034,17 @@ package android.media.session {
		method public void addOnActiveSessionsChangedListener(@NonNull android.media.session.MediaSessionManager.OnActiveSessionsChangedListener, @Nullable android.content.ComponentName);
		method public void addOnActiveSessionsChangedListener(@NonNull android.media.session.MediaSessionManager.OnActiveSessionsChangedListener, @Nullable android.content.ComponentName, @Nullable android.os.Handler);
		method public void addOnMediaKeyEventSessionChangedListener(@NonNull java.util.concurrent.Executor, @NonNull android.media.session.MediaSessionManager.OnMediaKeyEventSessionChangedListener);
		method public void addOnSession2TokensChangedListener(@NonNull android.media.session.MediaSessionManager.OnSession2TokensChangedListener);
		method public void addOnSession2TokensChangedListener(@NonNull android.media.session.MediaSessionManager.OnSession2TokensChangedListener, @NonNull android.os.Handler);
		method @Deprecated @FlaggedApi("com.android.media.mediasession.flags.deprecate_platform_mediasession2_apis") public void addOnSession2TokensChangedListener(@NonNull android.media.session.MediaSessionManager.OnSession2TokensChangedListener);
		method @Deprecated @FlaggedApi("com.android.media.mediasession.flags.deprecate_platform_mediasession2_apis") public void addOnSession2TokensChangedListener(@NonNull android.media.session.MediaSessionManager.OnSession2TokensChangedListener, @NonNull android.os.Handler);
		method @NonNull public java.util.List<android.media.session.MediaController> getActiveSessions(@Nullable android.content.ComponentName);
		method @Nullable public android.media.session.MediaSession.Token getMediaKeyEventSession();
		method @NonNull public String getMediaKeyEventSessionPackageName();
		method @NonNull public java.util.List<android.media.Session2Token> getSession2Tokens();
		method @Deprecated @FlaggedApi("com.android.media.mediasession.flags.deprecate_platform_mediasession2_apis") @NonNull public java.util.List<android.media.Session2Token> getSession2Tokens();
		method public boolean isTrustedForMediaControl(@NonNull android.media.session.MediaSessionManager.RemoteUserInfo);
		method @Deprecated public void notifySession2Created(@NonNull android.media.Session2Token);
		method public void removeOnActiveSessionsChangedListener(@NonNull android.media.session.MediaSessionManager.OnActiveSessionsChangedListener);
		method public void removeOnMediaKeyEventSessionChangedListener(@NonNull android.media.session.MediaSessionManager.OnMediaKeyEventSessionChangedListener);
		method public void removeOnSession2TokensChangedListener(@NonNull android.media.session.MediaSessionManager.OnSession2TokensChangedListener);
		method @Deprecated @FlaggedApi("com.android.media.mediasession.flags.deprecate_platform_mediasession2_apis") public void removeOnSession2TokensChangedListener(@NonNull android.media.session.MediaSessionManager.OnSession2TokensChangedListener);
		}

		public static interface MediaSessionManager.OnActiveSessionsChangedListener {
		@@ -28055,8 +28055,8 @@ package android.media.session {
		method public void onMediaKeyEventSessionChanged(@NonNull String, @Nullable android.media.session.MediaSession.Token);
		}

		public static interface MediaSessionManager.OnSession2TokensChangedListener {
		method public void onSession2TokensChanged(@NonNull java.util.List<android.media.Session2Token>);
		@Deprecated @FlaggedApi("com.android.media.mediasession.flags.deprecate_platform_mediasession2_apis") public static interface MediaSessionManager.OnSession2TokensChangedListener {
		method @Deprecated public void onSession2TokensChanged(@NonNull java.util.List<android.media.Session2Token>);
		}

		public static final class MediaSessionManager.RemoteUserInfo {

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

+18 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.media.session;

		import android.annotation.CallbackExecutor;
		import android.annotation.FlaggedApi;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.RequiresPermission;
		@@ -47,6 +48,7 @@ import android.view.KeyEvent;

		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.media.mediasession.flags.Flags;

		import java.util.ArrayList;
		import java.util.HashMap;
		@@ -290,7 +292,10 @@ public final class MediaSessionManager {
		* Session Library</a>.
		*
		* @return A list of {@link Session2Token}.
		* @deprecated {@link MediaSession2} is deprecated.
		*/
		@FlaggedApi(Flags.FLAG_DEPRECATE_PLATFORM_MEDIASESSION2_APIS)
		@Deprecated
		@NonNull
		public List<Session2Token> getSession2Tokens() {
		return mCommunicationManager.getSession2Tokens();
		@@ -420,7 +425,10 @@ public final class MediaSessionManager {
		* Session Library</a>.
		*
		* @param listener The listener to add
		* @deprecated {@link MediaSession2} is deprecated.
		*/
		@FlaggedApi(Flags.FLAG_DEPRECATE_PLATFORM_MEDIASESSION2_APIS)
		@Deprecated
		public void addOnSession2TokensChangedListener(
		@NonNull OnSession2TokensChangedListener listener) {
		addOnSession2TokensChangedListener(UserHandle.myUserId(), listener,
		@@ -437,7 +445,10 @@ public final class MediaSessionManager {
		*
		* @param listener The listener to add
		* @param handler The handler to call listener on.
		* @deprecated {@link MediaSession2} is deprecated.
		*/
		@FlaggedApi(Flags.FLAG_DEPRECATE_PLATFORM_MEDIASESSION2_APIS)
		@Deprecated
		public void addOnSession2TokensChangedListener(
		@NonNull OnSession2TokensChangedListener listener, @NonNull Handler handler) {
		Objects.requireNonNull(handler, "handler shouldn't be null");
		@@ -499,7 +510,10 @@ public final class MediaSessionManager {
		* Session Library</a>.
		*
		* @param listener The listener to remove.
		* @deprecated {@link MediaSession2} is deprecated.
		*/
		@FlaggedApi(Flags.FLAG_DEPRECATE_PLATFORM_MEDIASESSION2_APIS)
		@Deprecated
		public void removeOnSession2TokensChangedListener(
		@NonNull OnSession2TokensChangedListener listener) {
		Objects.requireNonNull(listener, "listener shouldn't be null");
		@@ -1063,7 +1077,11 @@ public final class MediaSessionManager {
		* session functionality should use the
		* <a href="{@docRoot}reference/androidx/media3/session/package-summary.html">AndroidX Media3
		* Session Library</a>.
		*
		* @deprecated {@link MediaSession2} is deprecated.
		*/
		@FlaggedApi(Flags.FLAG_DEPRECATE_PLATFORM_MEDIASESSION2_APIS)
		@Deprecated
		public interface OnSession2TokensChangedListener {
		/**
		* Called when the {@link #getSession2Tokens()} is changed.