From 6d2c5e59e8a3c1ad294b2e74bf7094643af57fe5 Mon Sep 17 00:00:00 2001 From: David Zhao Date: Wed, 1 Mar 2023 18:17:53 -0800 Subject: [PATCH] Add TVMessage bundle key constant Bug: 268292542 Test: atest Change-Id: Ib9945b0a4a39cf9fa3ce1612f5fd6d9cbe4160c6 --- core/api/current.txt | 1 + media/java/android/media/tv/TvInputManager.java | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/core/api/current.txt b/core/api/current.txt index 53dcd75cf59a1..3d7fc422b483d 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -27309,6 +27309,7 @@ package android.media.tv { field public static final int TIME_SHIFT_STATUS_UNAVAILABLE = 2; // 0x2 field public static final int TIME_SHIFT_STATUS_UNKNOWN = 0; // 0x0 field public static final int TIME_SHIFT_STATUS_UNSUPPORTED = 1; // 0x1 + field public static final String TV_MESSAGE_KEY_STREAM_ID = "android.media.tv.TvInputManager.stream_id"; field public static final String TV_MESSAGE_TYPE_CLOSED_CAPTION = "CC"; field public static final String TV_MESSAGE_TYPE_WATERMARK = "Watermark"; field public static final int VIDEO_UNAVAILABLE_REASON_AUDIO_ONLY = 4; // 0x4 diff --git a/media/java/android/media/tv/TvInputManager.java b/media/java/android/media/tv/TvInputManager.java index 8459538f102da..40b09f6b6cf50 100644 --- a/media/java/android/media/tv/TvInputManager.java +++ b/media/java/android/media/tv/TvInputManager.java @@ -144,6 +144,13 @@ public final class TvInputManager { @StringDef({TV_MESSAGE_TYPE_WATERMARK, TV_MESSAGE_TYPE_CLOSED_CAPTION}) public @interface TvMessageType {} + /** + * This constant is used as a {@link Bundle} key for TV messages. The value of the key + * identifies the stream on the TV input source for which the watermark event is relevant to. + */ + public static final String TV_MESSAGE_KEY_STREAM_ID = + "android.media.tv.TvInputManager.stream_id"; + static final int VIDEO_UNAVAILABLE_REASON_START = 0; static final int VIDEO_UNAVAILABLE_REASON_END = 18;