From 6e90e4ea4f816473d1941595d1b46b65ffed7bee Mon Sep 17 00:00:00 2001
From: Jae Seo <jaeseo@google.com>
Date: Tue, 1 Jul 2014 14:33:11 -0700
Subject: [PATCH] TvContract: Add a field for network affiliation to the
 Channels table

This is used to identify a channel that is commonly called by its
network affiliation instead of the display name.

Bug: 15993156
Change-Id: Ib5a15e0e44e815c98b762573b5a24289a86f9583
---
 api/current.txt                             |  1 +
 media/java/android/media/tv/TvContract.java | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/api/current.txt b/api/current.txt
index 139a651a7e07e..a6f025683224b 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -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";
diff --git a/media/java/android/media/tv/TvContract.java b/media/java/android/media/tv/TvContract.java
index d27dc5fc743a8..46aeb1d5c3ac9 100644
--- a/media/java/android/media/tv/TvContract.java
+++ b/media/java/android/media/tv/TvContract.java
@@ -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>