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

Merge "Add PlaybackState.ACTION_SET_PLAYBACK_SPEED"

Browse Source
This commit is contained in:
Hyundo Moon
2020-12-10 11:46:59 +00:00
committed by Android (Google) Code Review
parent ea748be0c9 161b4441a6
commit 154b489b40
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -28903,6 +28903,7 @@ package android.media.session {
field public static final long ACTION_PREPARE_FROM_URI = 131072L; // 0x20000L
field public static final long ACTION_REWIND = 8L; // 0x8L
field public static final long ACTION_SEEK_TO = 256L; // 0x100L
field public static final long ACTION_SET_PLAYBACK_SPEED = 4194304L; // 0x400000L
field public static final long ACTION_SET_RATING = 128L; // 0x80L
field public static final long ACTION_SKIP_TO_NEXT = 32L; // 0x20L
field public static final long ACTION_SKIP_TO_PREVIOUS = 16L; // 0x10L

13
media/java/android/media/session/PlaybackState.java
View File

@@ -46,7 +46,8 @@ public final class PlaybackState implements Parcelable {
ACTION_SKIP_TO_PREVIOUS, ACTION_SKIP_TO_NEXT, ACTION_FAST_FORWARD, ACTION_SET_RATING,
ACTION_SEEK_TO, ACTION_PLAY_PAUSE, ACTION_PLAY_FROM_MEDIA_ID, ACTION_PLAY_FROM_SEARCH,
ACTION_SKIP_TO_QUEUE_ITEM, ACTION_PLAY_FROM_URI, ACTION_PREPARE,
ACTION_PREPARE_FROM_MEDIA_ID, ACTION_PREPARE_FROM_SEARCH, ACTION_PREPARE_FROM_URI})
ACTION_PREPARE_FROM_MEDIA_ID, ACTION_PREPARE_FROM_SEARCH, ACTION_PREPARE_FROM_URI,
ACTION_SET_PLAYBACK_SPEED})
@Retention(RetentionPolicy.SOURCE)
public @interface Actions {}
@@ -176,6 +177,14 @@ public final class PlaybackState implements Parcelable {
*/
public static final long ACTION_PREPARE_FROM_URI = 1 << 17;
// Note: The value jumps from 1 << 17 to 1 << 22 for matching same value with AndroidX.
/**
* Indicates this session supports the set playback speed command.
*
* @see Builder#setActions(long)
*/
public static final long ACTION_SET_PLAYBACK_SPEED = 1 << 22;
/**
* @hide
*/
@@ -428,6 +437,7 @@ public final class PlaybackState implements Parcelable {
* <li> {@link PlaybackState#ACTION_PREPARE_FROM_MEDIA_ID}</li>
* <li> {@link PlaybackState#ACTION_PREPARE_FROM_SEARCH}</li>
* <li> {@link PlaybackState#ACTION_PREPARE_FROM_URI}</li>
* <li> {@link PlaybackState#ACTION_SET_PLAYBACK_SPEED}</li>
* </ul>
*/
@Actions
@@ -823,6 +833,7 @@ public final class PlaybackState implements Parcelable {
* <li> {@link PlaybackState#ACTION_PREPARE_FROM_MEDIA_ID}</li>
* <li> {@link PlaybackState#ACTION_PREPARE_FROM_SEARCH}</li>
* <li> {@link PlaybackState#ACTION_PREPARE_FROM_URI}</li>
* <li> {@link PlaybackState#ACTION_SET_PLAYBACK_SPEED}</li>
* </ul>
*
* @param actions The set of actions allowed.