Merge "TvContract: Add a field for network affiliation to the Channels table"
diff --git a/api/current.txt b/api/current.txt
index 12aac84..0b53039 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -15945,6 +15945,7 @@
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 d27dc5f..46aeb1d 100644
--- a/media/java/android/media/tv/TvContract.java
+++ b/media/java/android/media/tv/TvContract.java
@@ -617,6 +617,18 @@
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>
* Can be empty initially.