Remove COLUMN_CONDITIONAL_ACCESS from TvContract.

It turned out that having this flag in Channels table does not
make sense for some European countries because they scremble the signal
per program basis. Also, the current flag does not fit to the use-case
like 'pay per view'. Decided to remove this in L release because it's not
clear how we will handle the cases raised at this moment.

Change-Id: Ibbf829f331a307ac89a553e00ece18d5958e72b5

diff --git a/api/current.txt b/api/current.txt
index 167216f..569425f 100644 (file)
--- a/api/current.txt
+++ b/api/current.txt
@@ -16820,7 +16820,6 @@ package android.media.tv {
 
   public static final class TvContract.Channels implements android.media.tv.TvContract.BaseTvColumns {
     method public static final java.lang.String getVideoResolution(java.lang.String);
-    field public static final java.lang.String COLUMN_CONDITIONAL_ACCESS = "conditional_access";
     field public static final java.lang.String COLUMN_DESCRIPTION = "description";
     field public static final java.lang.String COLUMN_DISPLAY_NAME = "display_name";
     field public static final java.lang.String COLUMN_DISPLAY_NUMBER = "display_number";

diff --git a/media/java/android/media/tv/TvContract.java b/media/java/android/media/tv/TvContract.java
index d2071ef..1a43051 100644 (file)
--- a/media/java/android/media/tv/TvContract.java
+++ b/media/java/android/media/tv/TvContract.java
@@ -696,19 +696,6 @@ public final class TvContract {
         public static final String COLUMN_SEARCHABLE = "searchable";
 
         /**
-         * The flag indicating whether this TV channel is scrambled by conditional access or not.
-         * <p>
-         * This is used for indicating that this channel is protected by a conditional access
-         * system. A value of 1 indicates the channel is scrambled and the user is required
-         * to contact the service provider to watch this channel. A value of 0 indicates the channel
-         * is not scrambled. If not specified, this value is set to 0 (not scrambled) by default.
-         * </p><p>
-         * Type: INTEGER (boolean)
-         * </p>
-         */
-        public static final String COLUMN_CONDITIONAL_ACCESS = "conditional_access";
-
-        /**
          * The flag indicating whether this TV channel is locked or not.
          * <p>
          * This is primarily used for alternative parental control to prevent unauthorized users