diff options
author | Jae Seo <jaeseo@google.com> | 2014-05-14 13:29:06 -0700 |
---|---|---|
committer | Jae Seo <jaeseo@google.com> | 2014-05-22 20:46:48 +0000 |
commit | 7752244e47543ccdc8a45c05c769d6cac32b762b (patch) | |
tree | 6b8adb2e91928cdaee385dd49e6188a8b5b6dd1e /api | |
parent | b3442311e039ddc0ba5ecbf5dafe7bd2ad2d15f0 (diff) | |
download | frameworks_base-7752244e47543ccdc8a45c05c769d6cac32b762b.zip frameworks_base-7752244e47543ccdc8a45c05c769d6cac32b762b.tar.gz frameworks_base-7752244e47543ccdc8a45c05c769d6cac32b762b.tar.bz2 |
DO NOT MERGE. Add more columns to TV metadata to enable newly requested use cases
Added the following columns to the Channels table:
searchable - Used to hide certain channels from search.
locked - Used to prevent unauthorized users from watching certain
channels by requiring passcode.
Added the following columns to the Programs table:
genre - Used to describe the categorical genre.
audio_language - Used to list up available audio languages.
Bug: 14833588, Bug: 14123945, Bug: 14069779
Change-Id: Id01483f56ecf3b665e3d4dbcea1a4800ff7f031d
(cherry picked from commit 3532899452d62b6f2cd9250cb48ec204862fb3b2)
Diffstat (limited to 'api')
-rw-r--r-- | api/current.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index c38a82f..b1e9b69 100644 --- a/api/current.txt +++ b/api/current.txt @@ -25026,7 +25026,9 @@ package android.provider { 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"; + field public static final java.lang.String COLUMN_LOCKED = "locked"; 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"; field public static final java.lang.String COLUMN_SERVICE_NAME = "service_name"; field public static final java.lang.String COLUMN_SERVICE_TYPE = "service_type"; @@ -25064,10 +25066,12 @@ package android.provider { } public static final class TvContract.Programs implements android.provider.TvContract.BaseTvColumns { + field public static final java.lang.String COLUMN_AUDIO_LANGUAGE = "audio_language"; field public static final java.lang.String COLUMN_CHANNEL_ID = "channel_id"; field public static final java.lang.String COLUMN_DATA = "data"; field public static final java.lang.String COLUMN_DESCRIPTION = "description"; field public static final java.lang.String COLUMN_END_TIME_UTC_MILLIS = "end_time_utc_millis"; + field public static final java.lang.String COLUMN_GENRE = "genre"; field public static final java.lang.String COLUMN_LONG_DESCRIPTION = "long_description"; field public static final java.lang.String COLUMN_START_TIME_UTC_MILLIS = "start_time_utc_millis"; field public static final java.lang.String COLUMN_TITLE = "title"; |