diff options
| author | Jae Seo <jaeseo@google.com> | 2014-05-23 21:40:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-23 21:40:59 +0000 |
| commit | cd39dc783e69cd7ac474e24b6f6cf2949d513f87 (patch) | |
| tree | b20cacc769770be2ea3b8ff64254f81ff1f0dc8f /api | |
| parent | d6405c1c75838d1a883f1681770dcb5606d86e3a (diff) | |
| parent | 7752244e47543ccdc8a45c05c769d6cac32b762b (diff) | |
| download | frameworks_base-cd39dc783e69cd7ac474e24b6f6cf2949d513f87.zip frameworks_base-cd39dc783e69cd7ac474e24b6f6cf2949d513f87.tar.gz frameworks_base-cd39dc783e69cd7ac474e24b6f6cf2949d513f87.tar.bz2 | |
Merge "DO NOT MERGE. Add more columns to TV metadata to enable newly requested use cases" into lmp-preview-dev
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 edf62b3..d053faa 100644 --- a/api/current.txt +++ b/api/current.txt @@ -25072,7 +25072,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"; @@ -25110,10 +25112,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"; |