Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55a969f5 authored by Beth Thibodeau's avatar Beth Thibodeau Committed by Automerger Merge Worker
Browse files

Merge "Make MediaStyle#setRemotePlayback public" into udc-dev am: 506535c3 am: 99ac9327 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22105404



Change-Id: I88e7455d05a2ddad970f73261bc48b65e9f1c46c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 13d5bebf 99ac9327

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6613,6 +6613,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...);

  }

























core/api/system-current.txt



+0
−4




























Original line number
Diff line number
Diff line








@@ -968,10 +968,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 {















    method public boolean getSuppressShowOverApps();















    method public android.app.Notification.TvExtender setChannel(String);

























core/java/android/app/Notification.java



+0
−3




























Original line number
Diff line number
Diff line








@@ -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,