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

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

Merge "TvContract: Add a field for network affiliation to the Channels table"

parents f6e11122 6e90e4ea

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -15945,6 +15945,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_INTERNAL_PROVIDER_DATA = "internal_provider_data";

    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";

    field public static final java.lang.String COLUMN_SERVICE_ID = "service_id";

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

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

        public static final String COLUMN_DISPLAY_NAME = "display_name";



        /**

         * The network affiliation for this TV channel.

         * <p>

         * This is used to identify a channel that is commonly called by its network affiliation

         * instead of the display name. Examples include ABC for the channel KGO-HD, FOX for the

         * channel KTVU-HD and NBC for the channel KNTV-HD. Can be empty if not applicable.

         * </p><p>

         * Type: TEXT

         * </p>

         */

        public static final String COLUMN_NETWORK_AFFILIATION = "network_affiliation";



        /**

         * The description of this TV channel.

         * <p>