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

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

Merge "TIF: Add Programs.COLUMN_RECORDING_PROHIBITED" into nyc-dev

parents 996c4090 7c12cd3a

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -22898,6 +22898,7 @@ package android.media.tv { 
    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";

    field public static final java.lang.String COLUMN_LONG_DESCRIPTION = "long_description";

    field public static final java.lang.String COLUMN_POSTER_ART_URI = "poster_art_uri";

    field public static final java.lang.String COLUMN_RECORDING_PROHIBITED = "recording_prohibited";

    field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";

    field public static final java.lang.String COLUMN_SEASON_DISPLAY_NUMBER = "season_display_number";

    field public static final deprecated java.lang.String COLUMN_SEASON_NUMBER = "season_number";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -24504,6 +24504,7 @@ package android.media.tv { 
    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";

    field public static final java.lang.String COLUMN_LONG_DESCRIPTION = "long_description";

    field public static final java.lang.String COLUMN_POSTER_ART_URI = "poster_art_uri";

    field public static final java.lang.String COLUMN_RECORDING_PROHIBITED = "recording_prohibited";

    field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";

    field public static final java.lang.String COLUMN_SEASON_DISPLAY_NUMBER = "season_display_number";

    field public static final deprecated java.lang.String COLUMN_SEASON_NUMBER = "season_number";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -22966,6 +22966,7 @@ package android.media.tv { 
    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";

    field public static final java.lang.String COLUMN_LONG_DESCRIPTION = "long_description";

    field public static final java.lang.String COLUMN_POSTER_ART_URI = "poster_art_uri";

    field public static final java.lang.String COLUMN_RECORDING_PROHIBITED = "recording_prohibited";

    field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";

    field public static final java.lang.String COLUMN_SEASON_DISPLAY_NUMBER = "season_display_number";

    field public static final deprecated java.lang.String COLUMN_SEASON_NUMBER = "season_number";

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

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

        public static final String COLUMN_SEARCHABLE = "searchable";



        /**

         * The flag indicating whether recording of this program is prohibited.

         *

         * <p>A value of 1 indicates that recording of this program is prohibited and application

         * will not schedule any recording for this program. A value of 0 indicates that the

         * recording is not prohibited. If not specified, this value is set to 0 (not prohibited) by

         * default.

         *

         * <p>Type: INTEGER (boolean)

         */

        public static final String COLUMN_RECORDING_PROHIBITED = "recording_prohibited";



        /**

         * Internal data used by individual TV input services.

         *