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

Merge "Add start_time and end_time for PreviewPrograms" am: b46475496f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842874

Change-Id: I1bf7e91e72ebc3c9e59c32d1bed1761f5dcc6a8f
This commit is contained in:
wyau
2021-10-12 16:52:22 +00:00
committed by Automerger Merge Worker
parent c6af5600fd b46475496f
commit 117570f57c
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/current.txt
View File

@@ -25516,6 +25516,7 @@ package android.media.tv {
field public static final String COLUMN_CONTENT_ID = "content_id"; field public static final String COLUMN_CONTENT_ID = "content_id";
field public static final String COLUMN_CONTENT_RATING = "content_rating"; field public static final String COLUMN_CONTENT_RATING = "content_rating";
field public static final String COLUMN_DURATION_MILLIS = "duration_millis"; field public static final String COLUMN_DURATION_MILLIS = "duration_millis";
field public static final String COLUMN_END_TIME_UTC_MILLIS = "end_time_utc_millis";
field public static final String COLUMN_EPISODE_DISPLAY_NUMBER = "episode_display_number"; field public static final String COLUMN_EPISODE_DISPLAY_NUMBER = "episode_display_number";
field public static final String COLUMN_EPISODE_TITLE = "episode_title"; field public static final String COLUMN_EPISODE_TITLE = "episode_title";
field public static final String COLUMN_INTENT_URI = "intent_uri"; field public static final String COLUMN_INTENT_URI = "intent_uri";
@@ -25546,6 +25547,7 @@ package android.media.tv {
field public static final String COLUMN_SHORT_DESCRIPTION = "short_description"; field public static final String COLUMN_SHORT_DESCRIPTION = "short_description";
field public static final String COLUMN_SPLIT_ID = "split_id"; field public static final String COLUMN_SPLIT_ID = "split_id";
field public static final String COLUMN_STARTING_PRICE = "starting_price"; field public static final String COLUMN_STARTING_PRICE = "starting_price";
field public static final String COLUMN_START_TIME_UTC_MILLIS = "start_time_utc_millis";
field public static final String COLUMN_THUMBNAIL_ASPECT_RATIO = "poster_thumbnail_aspect_ratio"; field public static final String COLUMN_THUMBNAIL_ASPECT_RATIO = "poster_thumbnail_aspect_ratio";
field public static final String COLUMN_THUMBNAIL_URI = "thumbnail_uri"; field public static final String COLUMN_THUMBNAIL_URI = "thumbnail_uri";
field public static final String COLUMN_TITLE = "title"; field public static final String COLUMN_TITLE = "title";
@@ -25708,6 +25710,7 @@ package android.media.tv {
field public static final String COLUMN_CONTENT_ID = "content_id"; field public static final String COLUMN_CONTENT_ID = "content_id";
field public static final String COLUMN_CONTENT_RATING = "content_rating"; field public static final String COLUMN_CONTENT_RATING = "content_rating";
field public static final String COLUMN_DURATION_MILLIS = "duration_millis"; field public static final String COLUMN_DURATION_MILLIS = "duration_millis";
field public static final String COLUMN_END_TIME_UTC_MILLIS = "end_time_utc_millis";
field public static final String COLUMN_EPISODE_DISPLAY_NUMBER = "episode_display_number"; field public static final String COLUMN_EPISODE_DISPLAY_NUMBER = "episode_display_number";
field public static final String COLUMN_EPISODE_TITLE = "episode_title"; field public static final String COLUMN_EPISODE_TITLE = "episode_title";
field public static final String COLUMN_INTENT_URI = "intent_uri"; field public static final String COLUMN_INTENT_URI = "intent_uri";
@@ -25739,6 +25742,7 @@ package android.media.tv {
field public static final String COLUMN_SHORT_DESCRIPTION = "short_description"; field public static final String COLUMN_SHORT_DESCRIPTION = "short_description";
field public static final String COLUMN_SPLIT_ID = "split_id"; field public static final String COLUMN_SPLIT_ID = "split_id";
field public static final String COLUMN_STARTING_PRICE = "starting_price"; field public static final String COLUMN_STARTING_PRICE = "starting_price";
field public static final String COLUMN_START_TIME_UTC_MILLIS = "start_time_utc_millis";
field public static final String COLUMN_THUMBNAIL_ASPECT_RATIO = "poster_thumbnail_aspect_ratio"; field public static final String COLUMN_THUMBNAIL_ASPECT_RATIO = "poster_thumbnail_aspect_ratio";
field public static final String COLUMN_THUMBNAIL_URI = "thumbnail_uri"; field public static final String COLUMN_THUMBNAIL_URI = "thumbnail_uri";
field public static final String COLUMN_TITLE = "title"; field public static final String COLUMN_TITLE = "title";

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

@@ -1658,6 +1658,25 @@ public final class TvContract {
*/ */
String COLUMN_CONTENT_ID = "content_id"; String COLUMN_CONTENT_ID = "content_id";
/**
* The start time of this TV program, in milliseconds since the epoch.
*
* <p>Should be empty if this program is not live.
*
* <p>Type: INTEGER (long)
* @see #COLUMN_LIVE
*/
String COLUMN_START_TIME_UTC_MILLIS = "start_time_utc_millis";
/**
* The end time of this TV program, in milliseconds since the epoch.
*
* <p>Should be empty if this program is not live.
*
* <p>Type: INTEGER (long)
* @see #COLUMN_LIVE
*/
String COLUMN_END_TIME_UTC_MILLIS = "end_time_utc_millis";
} }
/** Column definitions for the TV channels table. */ /** Column definitions for the TV channels table. */