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

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

Merge "TIF: Add internal provider ID field to channels"

parents ab9b0024 485c9f7e

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -24025,6 +24025,7 @@ package android.media.tv { 
    field public static final java.lang.String COLUMN_DISPLAY_NAME = "display_name";

    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_ID = "internal_provider_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";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -25813,6 +25813,7 @@ package android.media.tv { 
    field public static final java.lang.String COLUMN_DISPLAY_NAME = "display_name";

    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_ID = "internal_provider_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";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -24120,6 +24120,7 @@ package android.media.tv { 
    field public static final java.lang.String COLUMN_DISPLAY_NAME = "display_name";

    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_ID = "internal_provider_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";

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

+12 −0
Original line number Diff line number Diff line
@@ -1299,6 +1299,18 @@ public final class TvContract { 
         */

        public static final String COLUMN_APP_LINK_INTENT_URI = "app_link_intent_uri";



        /**

         * The internal ID 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>Can be empty.

         *

         * <p>Type: TEXT

         */

        public static final String COLUMN_INTERNAL_PROVIDER_ID = "internal_provider_id";



        /**

         * Internal data used by individual TV input services.

         *