diff options
| -rw-r--r-- | core/api/module-lib-current.txt | 1 | ||||
| -rw-r--r-- | media/java/android/media/session/MediaSessionManager.java | 7 |
2 files changed, 2 insertions, 6 deletions
diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index 8a369c8f27c2..6e141b89f925 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -99,6 +99,7 @@ package android.media.session { method public boolean dispatchMediaKeyEventToSessionAsSystemService(@NonNull android.view.KeyEvent, @NonNull android.media.session.MediaSession.Token); method public void dispatchVolumeKeyEventAsSystemService(@NonNull android.view.KeyEvent, int); method public void dispatchVolumeKeyEventToSessionAsSystemService(@NonNull android.view.KeyEvent, @NonNull android.media.session.MediaSession.Token); + method @NonNull public java.util.List<android.media.session.MediaController> getActiveSessionsForUser(@Nullable android.content.ComponentName, int); method public void registerRemoteVolumeControllerCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.session.MediaSessionManager.RemoteVolumeControllerCallback); method public void unregisterRemoteVolumeControllerCallback(@NonNull android.media.session.MediaSessionManager.RemoteVolumeControllerCallback); field public static final int RESULT_MEDIA_KEY_HANDLED = 1; // 0x1 diff --git a/media/java/android/media/session/MediaSessionManager.java b/media/java/android/media/session/MediaSessionManager.java index 36158b70005b..6af39f8c55d2 100644 --- a/media/java/android/media/session/MediaSessionManager.java +++ b/media/java/android/media/session/MediaSessionManager.java @@ -23,7 +23,6 @@ import android.annotation.RequiresPermission; import android.annotation.SuppressLint; import android.annotation.SystemApi; import android.annotation.SystemService; -import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.content.Context; import android.content.pm.ParceledListSlice; @@ -32,7 +31,6 @@ import android.media.IRemoteVolumeControllerCallback; import android.media.MediaFrameworkInitializer; import android.media.MediaSession2; import android.media.Session2Token; -import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.RemoteException; @@ -210,10 +208,7 @@ public final class MediaSessionManager { * @return A list of controllers for ongoing sessions. * @hide */ - // TODO: Remove @UnsupportedAppUsage - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, publicAlternatives = "Should only be" - + " used by system apps, since non-system apps cannot get other users' sessions." - + " Use {@link #getActiveSessions} instead.") + @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) public @NonNull List<MediaController> getActiveSessionsForUser( @Nullable ComponentName notificationListener, int userId) { ArrayList<MediaController> controllers = new ArrayList<MediaController>(); |