Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f191e5a authored by wyau's avatar wyau Committed by Automerger Merge Worker
Browse files

Merge "Add start_time and end_time for PreviewPrograms" am: b4647549 am:... 

Merge "Add start_time and end_time for PreviewPrograms" am: b4647549 am: 117570f5 am: f29ea928 am: 49b79757 am: e1d8d6ed

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

Change-Id: I0b5b315dde5ffcaa077c0040ff6751c48f70cf7a
parents 13b9a31b e1d8d6ed

core/api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -25661,6 +25661,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";
@@ -25691,6 +25692,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";
@@ -25853,6 +25855,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";
@@ -25884,6 +25887,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";

media/java/android/media/tv/TvContract.java

+19 −0
Original line number Diff line number Diff line
@@ -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. */