diff options
| author | 2024-04-22 09:52:28 +0000 | |
|---|---|---|
| committer | 2024-04-22 09:52:28 +0000 | |
| commit | e9093b4ff7397c6183a38a5fa0f38cfbd63fb816 (patch) | |
| tree | e5bbc03c2be116e7049e8cde52bfa78d6e7e149b | |
| parent | f8e433bc646d9318d7d23786195b50ab75cf2201 (diff) | |
| parent | 70a1f459e3116779e646656191e079ea543a4452 (diff) | |
Merge "Revert "Hide STATE_PLAYBACK_SUPPRESSED from the public api"" into main
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | media/java/android/media/session/PlaybackState.java | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index c7fce1b3b996..c9ab524d86fa 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -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 diff --git a/media/java/android/media/session/PlaybackState.java b/media/java/android/media/session/PlaybackState.java index 4bacbf9a946e..47637b82111a 100644 --- a/media/java/android/media/session/PlaybackState.java +++ b/media/java/android/media/session/PlaybackState.java @@ -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; /** |