Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make MediaStyle#setRemotePlayback public" into udc-dev

Browse Source
This commit is contained in:
Beth Thibodeau
2023-03-16 17:35:35 +00:00
committed by Android (Google) Code Review
parent aa24b1bdc5 140c6ea5f0
commit 506535c339
3 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -6623,6 +6623,7 @@ package android.app {
ctor public Notification.MediaStyle(); ctor public Notification.MediaStyle();
ctor @Deprecated public Notification.MediaStyle(android.app.Notification.Builder); ctor @Deprecated public Notification.MediaStyle(android.app.Notification.Builder);
method public android.app.Notification.MediaStyle setMediaSession(android.media.session.MediaSession.Token); 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...); method public android.app.Notification.MediaStyle setShowActionsInCompactView(int...);
} }

4
core/api/system-current.txt
View File

@@ -968,10 +968,6 @@ package android.app {
field public static final int SEMANTIC_ACTION_MARK_CONVERSATION_AS_PRIORITY = 11; // 0xb 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 { public static final class Notification.TvExtender implements android.app.Notification.Extender {
ctor public Notification.TvExtender(); ctor public Notification.TvExtender();
ctor public Notification.TvExtender(android.app.Notification); ctor public Notification.TvExtender(android.app.Notification);

3
core/java/android/app/Notification.java
View File

@@ -9163,10 +9163,7 @@ public class Notification implements Parcelable
* {@code null}, in which case the output switcher will be disabled. * {@code null}, in which case the output switcher will be disabled.
* This intent should open an Activity or it will be ignored. * This intent should open an Activity or it will be ignored.
* @return MediaStyle * @return MediaStyle
*
* @hide
*/ */
@SystemApi
@RequiresPermission(android.Manifest.permission.MEDIA_CONTENT_CONTROL) @RequiresPermission(android.Manifest.permission.MEDIA_CONTENT_CONTROL)
@NonNull @NonNull
public MediaStyle setRemotePlaybackInfo(@NonNull CharSequence deviceName, public MediaStyle setRemotePlaybackInfo(@NonNull CharSequence deviceName,