diff options
| -rw-r--r-- | core/api/current.txt | 4 | ||||
| -rw-r--r-- | core/jni/android_os_Parcel.cpp | 9 | ||||
| -rw-r--r-- | media/java/android/media/tv/TvContract.java | 19 |
3 files changed, 26 insertions, 6 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 738851b78b30..131db7320f3f 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -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_RATING = "content_rating"; 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_TITLE = "episode_title"; 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_SPLIT_ID = "split_id"; 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_URI = "thumbnail_uri"; 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_RATING = "content_rating"; 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_TITLE = "episode_title"; 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_SPLIT_ID = "split_id"; 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_URI = "thumbnail_uri"; field public static final String COLUMN_TITLE = "title"; diff --git a/core/jni/android_os_Parcel.cpp b/core/jni/android_os_Parcel.cpp index aadd320eb2e1..42ff39535567 100644 --- a/core/jni/android_os_Parcel.cpp +++ b/core/jni/android_os_Parcel.cpp @@ -596,13 +596,10 @@ static jint android_os_Parcel_compareData(JNIEnv* env, jclass clazz, jlong thisN jlong otherNativePtr) { Parcel* thisParcel = reinterpret_cast<Parcel*>(thisNativePtr); - if (thisParcel == NULL) { - return 0; - } + LOG_ALWAYS_FATAL_IF(thisParcel == nullptr, "Should not be null"); + Parcel* otherParcel = reinterpret_cast<Parcel*>(otherNativePtr); - if (otherParcel == NULL) { - return thisParcel->getOpenAshmemSize(); - } + LOG_ALWAYS_FATAL_IF(otherParcel == nullptr, "Should not be null"); return thisParcel->compareData(*otherParcel); } diff --git a/media/java/android/media/tv/TvContract.java b/media/java/android/media/tv/TvContract.java index 30a14c84b72e..a0f6fb9577c3 100644 --- a/media/java/android/media/tv/TvContract.java +++ b/media/java/android/media/tv/TvContract.java @@ -1658,6 +1658,25 @@ public final class TvContract { */ 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. */ |