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

Commit cf5085bd authored by Jae Seo's avatar Jae Seo Committed by Android (Google) Code Review
Browse files

Merge "Add channel types for NTSC, PAL and SECAM"

parents 5ea183db 3a0f1998

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -15825,8 +15825,11 @@ package android.media.tv { 
    field public static final int TYPE_ISDB_S = 262656; // 0x40200

    field public static final int TYPE_ISDB_T = 262144; // 0x40000

    field public static final int TYPE_ISDB_TB = 262400; // 0x40100

    field public static final int TYPE_NTSC = 1; // 0x1

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

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

    field public static final int TYPE_PASSTHROUGH = 65536; // 0x10000

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

    field public static final int TYPE_S_DMB = 393472; // 0x60100

    field public static final int TYPE_T_DMB = 393216; // 0x60000

  }

media/java/android/media/tv/TvContract.java

+9 −0
Original line number Diff line number Diff line
@@ -272,6 +272,15 @@ public final class TvContract { 
        /** A generic channel type. */

        public static final int TYPE_OTHER = 0x0;



        /** The channel type for NTSC. */

        public static final int TYPE_NTSC = 0x1;



        /** The channel type for PAL. */

        public static final int TYPE_PAL = 0x2;



        /** The channel type for SECAM. */

        public static final int TYPE_SECAM = 0x3;



        /** The special channel type used for pass-through inputs such as HDMI. */

        public static final int TYPE_PASSTHROUGH = 0x00010000;