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

Commit e9093b4f authored by Bishoy Gendy's avatar Bishoy Gendy Committed by Android (Google) Code Review
Browse files

Merge "Revert "Hide STATE_PLAYBACK_SUPPRESSED from the public api"" into main

parents f8e433bc 70a1f459

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -26804,6 +26804,7 @@ 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

+4 −2
Original line number Diff line number Diff line
@@ -15,7 +15,10 @@ 
 */

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;
@@ -295,9 +298,8 @@ public final class PlaybackState implements Parcelable { 
     * foreground.

     *

     * @see Builder#setState

     * @hide

     */

    // TODO: b/335561702 Unhide this symbol for the next API bump.

    @FlaggedApi(FLAG_ENABLE_NOTIFYING_ACTIVITY_MANAGER_WITH_MEDIA_SESSION_STATUS_CHANGE)

    public static final int STATE_PLAYBACK_SUPPRESSED = 12;



    /**