Merge "Add PlaybackState.ACTION_SET_PLAYBACK_SPEED" (154b489b) · Commits · e / os / android_frameworks_base

core/api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -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

media/java/android/media/session/PlaybackState.java

+12 −1

Original line number	Diff line number	Diff line
		@@ -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.