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

Commit ad0db6fc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add a constant for ISDB_S3"

parents 4f7a8581 71fe12bb

api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -27681,6 +27681,7 @@ package android.media.tv { 
    field public static final String TYPE_DVB_T2 = "TYPE_DVB_T2";

    field public static final String TYPE_DVB_T2 = "TYPE_DVB_T2";

    field public static final String TYPE_ISDB_C = "TYPE_ISDB_C";

    field public static final String TYPE_ISDB_C = "TYPE_ISDB_C";

    field public static final String TYPE_ISDB_S = "TYPE_ISDB_S";

    field public static final String TYPE_ISDB_S = "TYPE_ISDB_S";

    field public static final String TYPE_ISDB_S3 = "TYPE_ISDB_S3";

    field public static final String TYPE_ISDB_T = "TYPE_ISDB_T";

    field public static final String TYPE_ISDB_T = "TYPE_ISDB_T";

    field public static final String TYPE_ISDB_TB = "TYPE_ISDB_TB";

    field public static final String TYPE_ISDB_TB = "TYPE_ISDB_TB";

    field public static final String TYPE_NTSC = "TYPE_NTSC";

    field public static final String TYPE_NTSC = "TYPE_NTSC";

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

+10 −1
Original line number Original line Diff line number Diff line
@@ -20,9 +20,9 @@ import android.annotation.IntDef; 
import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.SdkConstant;

import android.annotation.SdkConstant;

import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.StringDef;

import android.annotation.StringDef;

import android.annotation.SystemApi;

import android.annotation.SystemApi;

import android.annotation.SdkConstant.SdkConstantType;

import android.app.Activity;

import android.app.Activity;

import android.content.ComponentName;

import android.content.ComponentName;

import android.content.ContentResolver;

import android.content.ContentResolver;
@@ -1680,6 +1680,7 @@ public final class TvContract { 
                TYPE_ISDB_T,

                TYPE_ISDB_T,

                TYPE_ISDB_TB,

                TYPE_ISDB_TB,

                TYPE_ISDB_S,

                TYPE_ISDB_S,

                TYPE_ISDB_S3,

                TYPE_ISDB_C,

                TYPE_ISDB_C,

                TYPE_1SEG,

                TYPE_1SEG,

                TYPE_DTMB,

                TYPE_DTMB,
@@ -1820,6 +1821,13 @@ public final class TvContract { 
         */

         */

        public static final String TYPE_ISDB_S = "TYPE_ISDB_S";

        public static final String TYPE_ISDB_S = "TYPE_ISDB_S";





        /**

         * The channel type for ISDB-S3 (satellite).

         *

         * @see #COLUMN_TYPE

         */

        public static final String TYPE_ISDB_S3 = "TYPE_ISDB_S3";



        /**

        /**

         * The channel type for ISDB-C (cable).

         * The channel type for ISDB-C (cable).

         *

         *
@@ -2026,6 +2034,7 @@ public final class TvContract { 
         * {@link #TYPE_DVB_T2},

         * {@link #TYPE_DVB_T2},

         * {@link #TYPE_ISDB_C},

         * {@link #TYPE_ISDB_C},

         * {@link #TYPE_ISDB_S},

         * {@link #TYPE_ISDB_S},

         * {@link #TYPE_ISDB_S3},

         * {@link #TYPE_ISDB_T},

         * {@link #TYPE_ISDB_T},

         * {@link #TYPE_ISDB_TB},

         * {@link #TYPE_ISDB_TB},

         * {@link #TYPE_NTSC},

         * {@link #TYPE_NTSC},