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

Commit 8bbec8b0 authored by Henry Fang's avatar Henry Fang Committed by Automerger Merge Worker
Browse files

Merge "TvProvider API standardization for ARIB and DVB TvProvider" am:... 

Merge "TvProvider API standardization for ARIB and DVB TvProvider" am: 525fc0dc am: 4851cbef am: 1475f072 am: 573fd786

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

Change-Id: Ie554f98c35a4962d462a446a09b469300bd06cdf
parents 3a307720 573fd786

core/api/current.txt

+5 −0
Original line number Diff line number Diff line
@@ -26146,11 +26146,14 @@ package android.media.tv { 
    field public static final String COLUMN_INTERNAL_PROVIDER_FLAG2 = "internal_provider_flag2";

    field public static final String COLUMN_INTERNAL_PROVIDER_FLAG3 = "internal_provider_flag3";

    field public static final String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";

    field public static final String COLUMN_INTERNAL_PROVIDER_ID = "internal_provider_id";

    field public static final String COLUMN_LONG_DESCRIPTION = "long_description";

    field public static final String COLUMN_MULTI_SERIES_ID = "multi_series_id";

    field public static final String COLUMN_POSTER_ART_URI = "poster_art_uri";

    field public static final String COLUMN_RECORDING_PROHIBITED = "recording_prohibited";

    field public static final String COLUMN_REVIEW_RATING = "review_rating";

    field public static final String COLUMN_REVIEW_RATING_STYLE = "review_rating_style";

    field public static final String COLUMN_SCRAMBLED = "scrambled";

    field public static final String COLUMN_SEARCHABLE = "searchable";

    field public static final String COLUMN_SEASON_DISPLAY_NUMBER = "season_display_number";

    field @Deprecated public static final String COLUMN_SEASON_NUMBER = "season_number";
@@ -26210,7 +26213,9 @@ package android.media.tv { 
    field public static final String COLUMN_INTERNAL_PROVIDER_FLAG2 = "internal_provider_flag2";

    field public static final String COLUMN_INTERNAL_PROVIDER_FLAG3 = "internal_provider_flag3";

    field public static final String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";

    field public static final String COLUMN_INTERNAL_PROVIDER_ID = "internal_provider_id";

    field public static final String COLUMN_LONG_DESCRIPTION = "long_description";

    field public static final String COLUMN_MULTI_SERIES_ID = "multi_series_id";

    field public static final String COLUMN_POSTER_ART_URI = "poster_art_uri";

    field public static final String COLUMN_RECORDING_DATA_BYTES = "recording_data_bytes";

    field public static final String COLUMN_RECORDING_DATA_URI = "recording_data_uri";

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

+62 −0
Original line number Diff line number Diff line
@@ -2720,6 +2720,42 @@ public final class TvContract { 
         */

        public static final String COLUMN_GLOBAL_CONTENT_ID = "global_content_id";



        /**

         * The flag indicating whether this TV program is scrambled or not.

         *

         * <p>Use the same coding for scrambled in the underlying broadcast standard

         * if {@code free_ca_mode} in EIT is defined there (e.g. ETSI EN 300 468).

         *

         * <p>Type: INTEGER (boolean)

         */

        public static final String COLUMN_SCRAMBLED = "scrambled";



        /**

         * The comma-separated series IDs of this TV program for episodic TV shows.

         *

         * <p>This is used to indicate the series IDs.

         * Programs in the same series share a series ID.

         * Use this instead of {@link #COLUMN_SERIES_ID} if more than one series IDs

         * are assigned to the TV program.

         *

         * <p>Can be empty.

         *

         * <p>Type: TEXT

         */

        public static final String COLUMN_MULTI_SERIES_ID = "multi_series_id";



        /**

         * The internal ID used by individual TV input services.

         *

         * <p>This is internal to the provider that inserted it, and should not be decoded by other

         * apps.

         *

         * <p>Can be empty.

         *

         * <p>Type: TEXT

         */

        public static final String COLUMN_INTERNAL_PROVIDER_ID = "internal_provider_id";



        private Programs() {}



        /** Canonical genres for TV programs. */
@@ -3052,6 +3088,32 @@ public final class TvContract { 
        public static final String COLUMN_RECORDING_EXPIRE_TIME_UTC_MILLIS =

                "recording_expire_time_utc_millis";



        /**

         * The comma-separated series IDs of this TV program for episodic TV shows.

         *

         * <p>This is used to indicate the series IDs.

         * Programs in the same series share a series ID.

         * Use this instead of {@link #COLUMN_SERIES_ID} if more than one series IDs

         * are assigned to the TV program.

         *

         * <p>Can be empty.

         *

         * <p>Type: TEXT

         */

        public static final String COLUMN_MULTI_SERIES_ID = "multi_series_id";



        /**

         * The internal ID used by individual TV input services.

         *

         * <p>This is internal to the provider that inserted it, and should not be decoded by other

         * apps.

         *

         * <p>Can be empty.

         *

         * <p>Type: TEXT

         */

        public static final String COLUMN_INTERNAL_PROVIDER_ID = "internal_provider_id";



        private RecordedPrograms() {}

    }