summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hyundo Moon <hdmoon@google.com> 2020-11-27 19:19:55 +0900
committer Hyundo Moon <hdmoon@google.com> 2020-12-10 08:33:43 +0000
commit161b4441a60b7efd9d9a7212c621a3aaa7cb240c (patch)
tree533ba90b798b88c3a946f52e874fbd7ffdf7bae8
parent3e294531eb8982a72ebed11bc6bc5c2ae22bc923 (diff)
Add PlaybackState.ACTION_SET_PLAYBACK_SPEED
When "04fb2e7: MediaSession/Controller: Add playback speed related APIs" was merged, the constant was not added. This CL adds the new constant. Bug: 174297519 Test: m update-api -j; Change-Id: I698737bcfe641edd7b5ea07b4b385c81fe899994
-rw-r--r--core/api/current.txt1
-rw-r--r--media/java/android/media/session/PlaybackState.java13
2 files changed, 13 insertions, 1 deletions
diff --git a/core/api/current.txt b/core/api/current.txt
index cb5aea77004a..e35888f03e02 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -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
diff --git a/media/java/android/media/session/PlaybackState.java b/media/java/android/media/session/PlaybackState.java
index b1a88ed16bcd..e7d30ebba4b1 100644
--- a/media/java/android/media/session/PlaybackState.java
+++ b/media/java/android/media/session/PlaybackState.java
@@ -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.