Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: d523768

* commit 'd52376853da8b0b42f19e8129a59f269c2565646':
  TIF: Add Programs.COLUMN_RECORDING_PROHIBITED

Change-Id: I3acc697c147284ea405564a99fe1292841c17d51
This commit is contained in:
Dongwon Kang
2016-04-14 20:53:43 +00:00
committed by android-build-merger
parent 0b0fdacc56 d52376853d
commit 9752d2fd09
4 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -22901,6 +22901,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";

1
api/system-current.txt
View File

@@ -24507,6 +24507,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";

1
api/test-current.txt
View File

@@ -22969,6 +22969,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";

12
media/java/android/media/tv/TvContract.java
View File

@@ -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.
*