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

Commit b973baca authored by Dongwon Kang's avatar Dongwon Kang Committed by Android (Google) Code Review
Browse files

Merge "Add a column to TV channel metadata to enable a newly requested use case"

parents 3b728f5f 2b53aae9

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -15939,6 +15939,7 @@ 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_BROWSABLE = "browsable";

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

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

+13 −0
Original line number Diff line number Diff line
@@ -671,6 +671,19 @@ 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>