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

Commit a7b212d9 authored by Dongwon Kang's avatar Dongwon Kang Committed by Android (Google) Code Review
Browse files

Merge "TIF: Add COLUMN_INTERNAL_PROVIDER_FLAGX to TvContract.Programs"

parents 44f388a3 e6389669

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -17291,6 +17291,10 @@ package android.media.tv { 
    field public static final java.lang.String COLUMN_EPISODE_NUMBER = "episode_number";

    field public static final java.lang.String COLUMN_EPISODE_TITLE = "episode_title";

    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_DATA = "internal_provider_data";

    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG1 = "internal_provider_flag1";

    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG2 = "internal_provider_flag2";

    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG3 = "internal_provider_flag3";

    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";

    field public static final java.lang.String COLUMN_LONG_DESCRIPTION = "long_description";

    field public static final java.lang.String COLUMN_POSTER_ART_URI = "poster_art_uri";

    field public static final java.lang.String COLUMN_SEASON_NUMBER = "season_number";

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -18567,6 +18567,10 @@ package android.media.tv { 
    field public static final java.lang.String COLUMN_EPISODE_NUMBER = "episode_number";

    field public static final java.lang.String COLUMN_EPISODE_TITLE = "episode_title";

    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_DATA = "internal_provider_data";

    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG1 = "internal_provider_flag1";

    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG2 = "internal_provider_flag2";

    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG3 = "internal_provider_flag3";

    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";

    field public static final java.lang.String COLUMN_LONG_DESCRIPTION = "long_description";

    field public static final java.lang.String COLUMN_POSTER_ART_URI = "poster_art_uri";

    field public static final java.lang.String COLUMN_SEASON_NUMBER = "season_number";

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

+44 −0
Original line number Diff line number Diff line
@@ -1053,6 +1053,50 @@ public final class TvContract { 
         */

        public static final String COLUMN_INTERNAL_PROVIDER_DATA = "internal_provider_data";



        /**

         * Internal integer flag used by individual TV input services.

         * <p>

         * This is internal to the provider that inserted it, and should not be decoded by other

         * apps.

         * </p><p>

         * Type: INTEGER

         * </p>

         */

        public static final String COLUMN_INTERNAL_PROVIDER_FLAG1 = "internal_provider_flag1";



        /**

         * Internal integer flag used by individual TV input services.

         * <p>

         * This is internal to the provider that inserted it, and should not be decoded by other

         * apps.

         * </p><p>

         * Type: INTEGER

         * </p>

         */

        public static final String COLUMN_INTERNAL_PROVIDER_FLAG2 = "internal_provider_flag2";



        /**

         * Internal integer flag used by individual TV input services.

         * <p>

         * This is internal to the provider that inserted it, and should not be decoded by other

         * apps.

         * </p><p>

         * Type: INTEGER

         * </p>

         */

        public static final String COLUMN_INTERNAL_PROVIDER_FLAG3 = "internal_provider_flag3";



        /**

         * Internal integer flag used by individual TV input services.

         * <p>

         * This is internal to the provider that inserted it, and should not be decoded by other

         * apps.

         * </p><p>

         * Type: INTEGER

         * </p>

         */

        public static final String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";



        /**

         * The version number of this row entry used by TV input services.

         * <p>