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

Commit f1398fa3 authored by David Zhao's avatar David Zhao Committed by Automerger Merge Worker
Browse files

Merge "Add TVMessage bundle key constant" into udc-dev am: 28345b49 

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



Change-Id: Iac72aa4f9be9bb010b6bffc001df05aa64a6d4f5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 934e89e0 28345b49

core/api/current.txt

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

media/java/android/media/tv/TvInputManager.java

+7 −0
Original line number Diff line number Diff line
@@ -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;