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

Commit 0fd13feb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove STATE_PLAYBACK_SUPPRESSED" into main am: 448c575e am: b96a1611 

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



Change-Id: I8b5e417e352128144eae764e38baa21362adefc5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8ab1300f b96a1611

core/api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -26918,7 +26918,6 @@ package android.media.session { 
    field public static final int STATE_FAST_FORWARDING = 4; // 0x4

    field public static final int STATE_NONE = 0; // 0x0

    field public static final int STATE_PAUSED = 2; // 0x2

    field @FlaggedApi("com.android.media.flags.enable_notifying_activity_manager_with_media_session_status_change") public static final int STATE_PLAYBACK_SUPPRESSED = 12; // 0xc

    field public static final int STATE_PLAYING = 3; // 0x3

    field public static final int STATE_REWINDING = 5; // 0x5

    field public static final int STATE_SKIPPING_TO_NEXT = 10; // 0xa

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

+15 −29
Original line number Diff line number Diff line
@@ -15,10 +15,8 @@ 
 */

package android.media.session;



import static com.android.media.flags.Flags.FLAG_ENABLE_NOTIFYING_ACTIVITY_MANAGER_WITH_MEDIA_SESSION_STATUS_CHANGE;



import android.annotation.DrawableRes;

import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.LongDef;

import android.annotation.Nullable;
@@ -187,13 +185,21 @@ public final class PlaybackState implements Parcelable { 
     */

    public static final long ACTION_SET_PLAYBACK_SPEED = 1 << 22;



    /**

     * @hide

     */

    @IntDef({STATE_NONE, STATE_STOPPED, STATE_PAUSED, STATE_PLAYING, STATE_FAST_FORWARDING,

            STATE_REWINDING, STATE_BUFFERING, STATE_ERROR, STATE_CONNECTING,

            STATE_SKIPPING_TO_PREVIOUS, STATE_SKIPPING_TO_NEXT, STATE_SKIPPING_TO_QUEUE_ITEM,

            STATE_PLAYBACK_SUPPRESSED})

    /** @hide */

    @IntDef({

        STATE_NONE,

        STATE_STOPPED,

        STATE_PAUSED,

        STATE_PLAYING,

        STATE_FAST_FORWARDING,

        STATE_REWINDING,

        STATE_BUFFERING,

        STATE_ERROR,

        STATE_CONNECTING,

        STATE_SKIPPING_TO_PREVIOUS,

        STATE_SKIPPING_TO_NEXT,

        STATE_SKIPPING_TO_QUEUE_ITEM

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface State {}
@@ -289,19 +295,6 @@ public final class PlaybackState implements Parcelable { 
     */

    public static final int STATE_SKIPPING_TO_QUEUE_ITEM = 11;



    /**

     * State indicating that playback is paused due to an external transient interruption, like a

     * phone call.

     *

     * <p>This state is different from {@link #STATE_PAUSED} in that it is deemed transitory,

     * possibly allowing the service associated to the session in this state to run in the

     * foreground.

     *

     * @see Builder#setState

     */

    @FlaggedApi(FLAG_ENABLE_NOTIFYING_ACTIVITY_MANAGER_WITH_MEDIA_SESSION_STATUS_CHANGE)

    public static final int STATE_PLAYBACK_SUPPRESSED = 12;



    /**

     * Use this value for the position to indicate the position is not known.

     */
@@ -401,7 +394,6 @@ public final class PlaybackState implements Parcelable { 
     * <li> {@link PlaybackState#STATE_SKIPPING_TO_PREVIOUS}</li>

     * <li> {@link PlaybackState#STATE_SKIPPING_TO_NEXT}</li>

     * <li> {@link PlaybackState#STATE_SKIPPING_TO_QUEUE_ITEM}</li>

     * <li> {@link PlaybackState#STATE_PLAYBACK_SUPPRESSED}</li>

     * </ul>

     */

    @State
@@ -525,7 +517,6 @@ public final class PlaybackState implements Parcelable { 
     * <li>{@link #STATE_SKIPPING_TO_NEXT}</li>

     * <li>{@link #STATE_SKIPPING_TO_PREVIOUS}</li>

     * <li>{@link #STATE_SKIPPING_TO_QUEUE_ITEM}</li>

     * <li>{@link #STATE_PLAYBACK_SUPPRESSED}</li>

     * </ul>

     */

    public boolean isActive() {
@@ -538,7 +529,6 @@ public final class PlaybackState implements Parcelable { 
            case PlaybackState.STATE_BUFFERING:

            case PlaybackState.STATE_CONNECTING:

            case PlaybackState.STATE_PLAYING:

            case PlaybackState.STATE_PLAYBACK_SUPPRESSED:

                return true;

        }

        return false;
@@ -584,8 +574,6 @@ public final class PlaybackState implements Parcelable { 
                return "SKIPPING_TO_NEXT";

            case STATE_SKIPPING_TO_QUEUE_ITEM:

                return "SKIPPING_TO_QUEUE_ITEM";

            case STATE_PLAYBACK_SUPPRESSED:

                return "STATE_PLAYBACK_SUPPRESSED";

            default:

                return "UNKNOWN";

        }
@@ -823,7 +811,6 @@ public final class PlaybackState implements Parcelable { 
         * <li> {@link PlaybackState#STATE_SKIPPING_TO_PREVIOUS}</li>

         * <li> {@link PlaybackState#STATE_SKIPPING_TO_NEXT}</li>

         * <li> {@link PlaybackState#STATE_SKIPPING_TO_QUEUE_ITEM}</li>

         * <li> {@link PlaybackState#STATE_PLAYBACK_SUPPRESSED}</li>

         * </ul>

         *

         * @param state The current state of playback.
@@ -868,7 +855,6 @@ public final class PlaybackState implements Parcelable { 
         * <li> {@link PlaybackState#STATE_SKIPPING_TO_PREVIOUS}</li>

         * <li> {@link PlaybackState#STATE_SKIPPING_TO_NEXT}</li>

         * <li> {@link PlaybackState#STATE_SKIPPING_TO_QUEUE_ITEM}</li>

         * <li> {@link PlaybackState#STATE_PLAYBACK_SUPPRESSED}</li>

         * </ul>

         *

         * @param state The current state of playback.