From 140c6ea5f0b59cac0ab8cac085830006317b7de7 Mon Sep 17 00:00:00 2001 From: Beth Thibodeau Date: Wed, 15 Mar 2023 14:59:05 -0500 Subject: [PATCH] Make MediaStyle#setRemotePlayback public Remove @hide and @SystemAPI from setRemotePlayback. The API is stil guarded by the signature|privileged permission MEDIA_CONTENT_CONTROL. Test: atest NotificationManagerServiceTest Test: atest NotificationManagerTest (CTS test) Bug: 243678618 Change-Id: I20a232a09cb8968013509ad89aeb004cf5f9cb11 --- core/api/current.txt | 1 + core/api/system-current.txt | 4 ---- core/java/android/app/Notification.java | 3 --- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index 2db3eae5fab6c..08314f3eac2a5 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -6604,6 +6604,7 @@ package android.app { ctor public Notification.MediaStyle(); ctor @Deprecated public Notification.MediaStyle(android.app.Notification.Builder); method public android.app.Notification.MediaStyle setMediaSession(android.media.session.MediaSession.Token); + method @NonNull @RequiresPermission(android.Manifest.permission.MEDIA_CONTENT_CONTROL) public android.app.Notification.MediaStyle setRemotePlaybackInfo(@NonNull CharSequence, @DrawableRes int, @Nullable android.app.PendingIntent); method public android.app.Notification.MediaStyle setShowActionsInCompactView(int...); } diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 3307a4fab9229..dd7573aa2d38a 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -981,10 +981,6 @@ package android.app { field public static final int SEMANTIC_ACTION_MARK_CONVERSATION_AS_PRIORITY = 11; // 0xb } - public static class Notification.MediaStyle extends android.app.Notification.Style { - method @NonNull @RequiresPermission(android.Manifest.permission.MEDIA_CONTENT_CONTROL) public android.app.Notification.MediaStyle setRemotePlaybackInfo(@NonNull CharSequence, @DrawableRes int, @Nullable android.app.PendingIntent); - } - public static final class Notification.TvExtender implements android.app.Notification.Extender { ctor public Notification.TvExtender(); ctor public Notification.TvExtender(android.app.Notification); diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 440ee202cc5bb..137a950ff002b 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -9163,10 +9163,7 @@ public class Notification implements Parcelable * {@code null}, in which case the output switcher will be disabled. * This intent should open an Activity or it will be ignored. * @return MediaStyle - * - * @hide */ - @SystemApi @RequiresPermission(android.Manifest.permission.MEDIA_CONTENT_CONTROL) @NonNull public MediaStyle setRemotePlaybackInfo(@NonNull CharSequence deviceName,