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

Commit 28299099 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"

parents 10c6e230 4536512f

api/current.txt

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

    field public static final java.lang.String COLUMN_INPUT_ID = "input_id";

    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_NETWORK_AFFILIATION = "network_affiliation";

    field public static final java.lang.String COLUMN_ORIGINAL_NETWORK_ID = "original_network_id";

    field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";

api/system-current.txt

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

    field public static final java.lang.String COLUMN_INPUT_ID = "input_id";

    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_LOCKED = "locked";

    field public static final java.lang.String COLUMN_NETWORK_AFFILIATION = "network_affiliation";

    field public static final java.lang.String COLUMN_ORIGINAL_NETWORK_ID = "original_network_id";

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

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