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

Commit c6eb54ce authored by Dongwon Kang's avatar Dongwon Kang
Browse files

TIF: add BaseProgramColumns in TvContract 

Programs and RecordedPrograms have a lot in common. This change
introduces BaseProgramColumns which removes the duplicates.
This will be also helpful for the further clean-up.

Test: build & passes CtsTvTestCases without modification
Bug: 34853064
Change-Id: I4ad352a9a904e7fef57c56acec5583df92b4226c
parent 40eb0ba4

api/current.txt

+27 −46
Original line number Diff line number Diff line
@@ -23867,6 +23867,31 @@ package android.media.tv { 
    field public static final java.lang.String AUTHORITY = "android.media.tv";

  }













  public static abstract interface TvContract.BaseProgramColumns implements android.media.tv.TvContract.BaseTvColumns {













    field public static final java.lang.String COLUMN_AUDIO_LANGUAGE = "audio_language";













    field public static final java.lang.String COLUMN_CANONICAL_GENRE = "canonical_genre";













    field public static final java.lang.String COLUMN_CHANNEL_ID = "channel_id";













    field public static final java.lang.String COLUMN_CONTENT_RATING = "content_rating";













    field public static final java.lang.String COLUMN_EPISODE_DISPLAY_NUMBER = "episode_display_number";













    field public static final java.lang.String COLUMN_EPISODE_TITLE = "episode_title";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_DATA = "internal_provider_data";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG1 = "internal_provider_flag1";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG2 = "internal_provider_flag2";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG3 = "internal_provider_flag3";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";













    field public static final java.lang.String COLUMN_LONG_DESCRIPTION = "long_description";













    field public static final java.lang.String COLUMN_POSTER_ART_URI = "poster_art_uri";













    field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";













    field public static final java.lang.String COLUMN_SEASON_DISPLAY_NUMBER = "season_display_number";













    field public static final java.lang.String COLUMN_SEASON_TITLE = "season_title";













    field public static final java.lang.String COLUMN_SHORT_DESCRIPTION = "short_description";













    field public static final java.lang.String COLUMN_THUMBNAIL_URI = "thumbnail_uri";













    field public static final java.lang.String COLUMN_TITLE = "title";













    field public static final java.lang.String COLUMN_VERSION_NUMBER = "version_number";













    field public static final java.lang.String COLUMN_VIDEO_HEIGHT = "video_height";













    field public static final java.lang.String COLUMN_VIDEO_WIDTH = "video_width";













  }



























  public static abstract interface TvContract.BaseTvColumns implements android.provider.BaseColumns {















    field public static final java.lang.String COLUMN_PACKAGE_NAME = "package_name";















  }










@@ -23949,7 +23974,7 @@ package android.media.tv {













    field public static final java.lang.String CONTENT_DIRECTORY = "logo";















  }



























  public static final class TvContract.Programs implements android.media.tv.TvContract.BaseTvColumns {













  public static final class TvContract.Programs implements android.media.tv.TvContract.BaseProgramColumns {















    field public static final java.lang.String ASPECT_RATIO_16_9 = "ASPECT_RATIO_16_9";















    field public static final java.lang.String ASPECT_RATIO_1_1 = "ASPECT_RATIO_1_1";















    field public static final java.lang.String ASPECT_RATIO_2_3 = "ASPECT_RATIO_2_3";









@@ -23958,53 +23983,31 @@ package android.media.tv {













    field public static final java.lang.String AVAILABILITY_FREE_WITH_SUBSCRIPTION = "AVAILABILITY_FREE_WITH_SUBSCRIPTION";















    field public static final java.lang.String AVAILABILITY_PAID_CONTENT = "AVAILABILITY_PAID_CONTENT";















    field public static final java.lang.String COLUMN_APP_LINK_INTENT_URI = "app_link_intent_uri";













    field public static final java.lang.String COLUMN_AUDIO_LANGUAGE = "audio_language";















    field public static final java.lang.String COLUMN_AUTHOR = "author";















    field public static final java.lang.String COLUMN_AVAILABILITY = "availability";















    field public static final java.lang.String COLUMN_BROADCAST_GENRE = "broadcast_genre";













    field public static final java.lang.String COLUMN_CANONICAL_GENRE = "canonical_genre";













    field public static final java.lang.String COLUMN_CHANNEL_ID = "channel_id";













    field public static final java.lang.String COLUMN_CONTENT_RATING = "content_rating";















    field public static final java.lang.String COLUMN_DURATION_MILLIS = "duration_millis";















    field public static final java.lang.String COLUMN_END_TIME_UTC_MILLIS = "end_time_utc_millis";













    field public static final java.lang.String COLUMN_EPISODE_DISPLAY_NUMBER = "episode_display_number";















    field public static final deprecated java.lang.String COLUMN_EPISODE_NUMBER = "episode_number";













    field public static final java.lang.String COLUMN_EPISODE_TITLE = "episode_title";















    field public static final java.lang.String COLUMN_INTERACTION_COUNT = "interaction_count";















    field public static final java.lang.String COLUMN_INTERACTION_TYPE = "interaction_type";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_DATA = "internal_provider_data";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG1 = "internal_provider_flag1";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG2 = "internal_provider_flag2";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG3 = "internal_provider_flag3";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";















    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_ID = "internal_provider_id";















    field public static final java.lang.String COLUMN_ITEM_COUNT = "item_count";















    field public static final java.lang.String COLUMN_LAST_PLAYBACK_POSITION_MILLIS = "last_playback_position_millis";















    field public static final java.lang.String COLUMN_LIVE = "live";















    field public static final java.lang.String COLUMN_LOGO_URI = "logo_uri";













    field public static final java.lang.String COLUMN_LONG_DESCRIPTION = "long_description";















    field public static final java.lang.String COLUMN_OFFER_PRICE = "offer_price";















    field public static final java.lang.String COLUMN_POSTER_ART_ASPECT_RATIO = "poster_art_aspect_ratio";













    field public static final java.lang.String COLUMN_POSTER_ART_URI = "poster_art_uri";















    field public static final java.lang.String COLUMN_PREVIEW_VIDEO_URI = "preview_video_uri";















    field public static final java.lang.String COLUMN_RECORDING_PROHIBITED = "recording_prohibited";















    field public static final java.lang.String COLUMN_RELEASE_DATE = "release_date";















    field public static final java.lang.String COLUMN_REVIEW_RATING = "review_rating";















    field public static final java.lang.String COLUMN_REVIEW_RATING_STYLE = "review_rating_style";













    field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";













    field public static final java.lang.String COLUMN_SEASON_DISPLAY_NUMBER = "season_display_number";















    field public static final deprecated java.lang.String COLUMN_SEASON_NUMBER = "season_number";













    field public static final java.lang.String COLUMN_SEASON_TITLE = "season_title";













    field public static final java.lang.String COLUMN_SHORT_DESCRIPTION = "short_description";















    field public static final java.lang.String COLUMN_STARTING_PRICE = "starting_price";















    field public static final java.lang.String COLUMN_START_TIME_UTC_MILLIS = "start_time_utc_millis";















    field public static final java.lang.String COLUMN_THUMBNAIL_ASPECT_RATIO = "poster_thumbnail_aspect_ratio";













    field public static final java.lang.String COLUMN_THUMBNAIL_URI = "thumbnail_uri";













    field public static final java.lang.String COLUMN_TITLE = "title";















    field public static final java.lang.String COLUMN_TYPE = "type";













    field public static final java.lang.String COLUMN_VERSION_NUMBER = "version_number";













    field public static final java.lang.String COLUMN_VIDEO_HEIGHT = "video_height";













    field public static final java.lang.String COLUMN_VIDEO_WIDTH = "video_width";















    field public static final java.lang.String COLUMN_WATCH_NEXT_TYPE = "watch_next_type";















    field public static final java.lang.String COLUMN_WEIGHT = "weight";















    field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/program";










@@ -24060,37 +24063,15 @@ package android.media.tv {













    field public static final java.lang.String TRAVEL = "TRAVEL";















  }



























  public static final class TvContract.RecordedPrograms implements android.media.tv.TvContract.BaseTvColumns {













    field public static final java.lang.String COLUMN_AUDIO_LANGUAGE = "audio_language";













  public static final class TvContract.RecordedPrograms implements android.media.tv.TvContract.BaseProgramColumns {















    field public static final java.lang.String COLUMN_BROADCAST_GENRE = "broadcast_genre";













    field public static final java.lang.String COLUMN_CANONICAL_GENRE = "canonical_genre";













    field public static final java.lang.String COLUMN_CHANNEL_ID = "channel_id";













    field public static final java.lang.String COLUMN_CONTENT_RATING = "content_rating";















    field public static final java.lang.String COLUMN_END_TIME_UTC_MILLIS = "end_time_utc_millis";













    field public static final java.lang.String COLUMN_EPISODE_DISPLAY_NUMBER = "episode_display_number";













    field public static final java.lang.String COLUMN_EPISODE_TITLE = "episode_title";















    field public static final java.lang.String COLUMN_INPUT_ID = "input_id";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_DATA = "internal_provider_data";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG1 = "internal_provider_flag1";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG2 = "internal_provider_flag2";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG3 = "internal_provider_flag3";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";













    field public static final java.lang.String COLUMN_LONG_DESCRIPTION = "long_description";













    field public static final java.lang.String COLUMN_POSTER_ART_URI = "poster_art_uri";















    field public static final java.lang.String COLUMN_RECORDING_DATA_BYTES = "recording_data_bytes";















    field public static final java.lang.String COLUMN_RECORDING_DATA_URI = "recording_data_uri";















    field public static final java.lang.String COLUMN_RECORDING_DURATION_MILLIS = "recording_duration_millis";















    field public static final java.lang.String COLUMN_RECORDING_EXPIRE_TIME_UTC_MILLIS = "recording_expire_time_utc_millis";













    field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";













    field public static final java.lang.String COLUMN_SEASON_DISPLAY_NUMBER = "season_display_number";













    field public static final java.lang.String COLUMN_SEASON_TITLE = "season_title";













    field public static final java.lang.String COLUMN_SHORT_DESCRIPTION = "short_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_THUMBNAIL_URI = "thumbnail_uri";













    field public static final java.lang.String COLUMN_TITLE = "title";













    field public static final java.lang.String COLUMN_VERSION_NUMBER = "version_number";













    field public static final java.lang.String COLUMN_VIDEO_HEIGHT = "video_height";













    field public static final java.lang.String COLUMN_VIDEO_WIDTH = "video_width";















    field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/recorded_program";















    field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/recorded_program";















    field public static final android.net.Uri CONTENT_URI;

























api/system-current.txt



+27
−46




























Original line number
Diff line number
Diff line








@@ -25620,6 +25620,31 @@ package android.media.tv {













    field public static final java.lang.String AUTHORITY = "android.media.tv";















  }



























  public static abstract interface TvContract.BaseProgramColumns implements android.media.tv.TvContract.BaseTvColumns {













    field public static final java.lang.String COLUMN_AUDIO_LANGUAGE = "audio_language";













    field public static final java.lang.String COLUMN_CANONICAL_GENRE = "canonical_genre";













    field public static final java.lang.String COLUMN_CHANNEL_ID = "channel_id";













    field public static final java.lang.String COLUMN_CONTENT_RATING = "content_rating";













    field public static final java.lang.String COLUMN_EPISODE_DISPLAY_NUMBER = "episode_display_number";













    field public static final java.lang.String COLUMN_EPISODE_TITLE = "episode_title";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_DATA = "internal_provider_data";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG1 = "internal_provider_flag1";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG2 = "internal_provider_flag2";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG3 = "internal_provider_flag3";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";













    field public static final java.lang.String COLUMN_LONG_DESCRIPTION = "long_description";













    field public static final java.lang.String COLUMN_POSTER_ART_URI = "poster_art_uri";













    field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";













    field public static final java.lang.String COLUMN_SEASON_DISPLAY_NUMBER = "season_display_number";













    field public static final java.lang.String COLUMN_SEASON_TITLE = "season_title";













    field public static final java.lang.String COLUMN_SHORT_DESCRIPTION = "short_description";













    field public static final java.lang.String COLUMN_THUMBNAIL_URI = "thumbnail_uri";













    field public static final java.lang.String COLUMN_TITLE = "title";













    field public static final java.lang.String COLUMN_VERSION_NUMBER = "version_number";













    field public static final java.lang.String COLUMN_VIDEO_HEIGHT = "video_height";













    field public static final java.lang.String COLUMN_VIDEO_WIDTH = "video_width";













  }



























  public static abstract interface TvContract.BaseTvColumns implements android.provider.BaseColumns {















    field public static final java.lang.String COLUMN_PACKAGE_NAME = "package_name";















  }










@@ -25706,7 +25731,7 @@ package android.media.tv {













    field public static final java.lang.String CONTENT_DIRECTORY = "logo";















  }



























  public static final class TvContract.Programs implements android.media.tv.TvContract.BaseTvColumns {













  public static final class TvContract.Programs implements android.media.tv.TvContract.BaseProgramColumns {















    field public static final java.lang.String ASPECT_RATIO_16_9 = "ASPECT_RATIO_16_9";















    field public static final java.lang.String ASPECT_RATIO_1_1 = "ASPECT_RATIO_1_1";















    field public static final java.lang.String ASPECT_RATIO_2_3 = "ASPECT_RATIO_2_3";









@@ -25715,54 +25740,32 @@ package android.media.tv {













    field public static final java.lang.String AVAILABILITY_FREE_WITH_SUBSCRIPTION = "AVAILABILITY_FREE_WITH_SUBSCRIPTION";















    field public static final java.lang.String AVAILABILITY_PAID_CONTENT = "AVAILABILITY_PAID_CONTENT";















    field public static final java.lang.String COLUMN_APP_LINK_INTENT_URI = "app_link_intent_uri";













    field public static final java.lang.String COLUMN_AUDIO_LANGUAGE = "audio_language";















    field public static final java.lang.String COLUMN_AUTHOR = "author";















    field public static final java.lang.String COLUMN_AVAILABILITY = "availability";















    field public static final java.lang.String COLUMN_BROADCAST_GENRE = "broadcast_genre";













    field public static final java.lang.String COLUMN_CANONICAL_GENRE = "canonical_genre";













    field public static final java.lang.String COLUMN_CHANNEL_ID = "channel_id";













    field public static final java.lang.String COLUMN_CONTENT_RATING = "content_rating";















    field public static final java.lang.String COLUMN_DURATION_MILLIS = "duration_millis";















    field public static final java.lang.String COLUMN_END_TIME_UTC_MILLIS = "end_time_utc_millis";













    field public static final java.lang.String COLUMN_EPISODE_DISPLAY_NUMBER = "episode_display_number";















    field public static final deprecated java.lang.String COLUMN_EPISODE_NUMBER = "episode_number";













    field public static final java.lang.String COLUMN_EPISODE_TITLE = "episode_title";















    field public static final java.lang.String COLUMN_INTERACTION_COUNT = "interaction_count";















    field public static final java.lang.String COLUMN_INTERACTION_TYPE = "interaction_type";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_DATA = "internal_provider_data";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG1 = "internal_provider_flag1";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG2 = "internal_provider_flag2";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG3 = "internal_provider_flag3";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";















    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_ID = "internal_provider_id";















    field public static final java.lang.String COLUMN_ITEM_COUNT = "item_count";















    field public static final java.lang.String COLUMN_LAST_PLAYBACK_POSITION_MILLIS = "last_playback_position_millis";















    field public static final java.lang.String COLUMN_LIVE = "live";















    field public static final java.lang.String COLUMN_LOGO_URI = "logo_uri";













    field public static final java.lang.String COLUMN_LONG_DESCRIPTION = "long_description";















    field public static final java.lang.String COLUMN_OFFER_PRICE = "offer_price";















    field public static final java.lang.String COLUMN_POSTER_ART_ASPECT_RATIO = "poster_art_aspect_ratio";













    field public static final java.lang.String COLUMN_POSTER_ART_URI = "poster_art_uri";















    field public static final java.lang.String COLUMN_PREVIEW_VIDEO_URI = "preview_video_uri";















    field public static final java.lang.String COLUMN_RECORDING_PROHIBITED = "recording_prohibited";















    field public static final java.lang.String COLUMN_RELEASE_DATE = "release_date";















    field public static final java.lang.String COLUMN_REVIEW_RATING = "review_rating";















    field public static final java.lang.String COLUMN_REVIEW_RATING_STYLE = "review_rating_style";













    field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";













    field public static final java.lang.String COLUMN_SEASON_DISPLAY_NUMBER = "season_display_number";















    field public static final deprecated java.lang.String COLUMN_SEASON_NUMBER = "season_number";













    field public static final java.lang.String COLUMN_SEASON_TITLE = "season_title";













    field public static final java.lang.String COLUMN_SHORT_DESCRIPTION = "short_description";















    field public static final java.lang.String COLUMN_STARTING_PRICE = "starting_price";















    field public static final java.lang.String COLUMN_START_TIME_UTC_MILLIS = "start_time_utc_millis";















    field public static final java.lang.String COLUMN_THUMBNAIL_ASPECT_RATIO = "poster_thumbnail_aspect_ratio";













    field public static final java.lang.String COLUMN_THUMBNAIL_URI = "thumbnail_uri";













    field public static final java.lang.String COLUMN_TITLE = "title";















    field public static final java.lang.String COLUMN_TRANSIENT = "transient";















    field public static final java.lang.String COLUMN_TYPE = "type";













    field public static final java.lang.String COLUMN_VERSION_NUMBER = "version_number";













    field public static final java.lang.String COLUMN_VIDEO_HEIGHT = "video_height";













    field public static final java.lang.String COLUMN_VIDEO_WIDTH = "video_width";















    field public static final java.lang.String COLUMN_WATCH_NEXT_TYPE = "watch_next_type";















    field public static final java.lang.String COLUMN_WEIGHT = "weight";















    field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/program";










@@ -25818,37 +25821,15 @@ package android.media.tv {













    field public static final java.lang.String TRAVEL = "TRAVEL";















  }



























  public static final class TvContract.RecordedPrograms implements android.media.tv.TvContract.BaseTvColumns {













    field public static final java.lang.String COLUMN_AUDIO_LANGUAGE = "audio_language";













  public static final class TvContract.RecordedPrograms implements android.media.tv.TvContract.BaseProgramColumns {















    field public static final java.lang.String COLUMN_BROADCAST_GENRE = "broadcast_genre";













    field public static final java.lang.String COLUMN_CANONICAL_GENRE = "canonical_genre";













    field public static final java.lang.String COLUMN_CHANNEL_ID = "channel_id";













    field public static final java.lang.String COLUMN_CONTENT_RATING = "content_rating";















    field public static final java.lang.String COLUMN_END_TIME_UTC_MILLIS = "end_time_utc_millis";













    field public static final java.lang.String COLUMN_EPISODE_DISPLAY_NUMBER = "episode_display_number";













    field public static final java.lang.String COLUMN_EPISODE_TITLE = "episode_title";















    field public static final java.lang.String COLUMN_INPUT_ID = "input_id";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_DATA = "internal_provider_data";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG1 = "internal_provider_flag1";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG2 = "internal_provider_flag2";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG3 = "internal_provider_flag3";













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";













    field public static final java.lang.String COLUMN_LONG_DESCRIPTION = "long_description";













    field public static final java.lang.String COLUMN_POSTER_ART_URI = "poster_art_uri";















    field public static final java.lang.String COLUMN_RECORDING_DATA_BYTES = "recording_data_bytes";















    field public static final java.lang.String COLUMN_RECORDING_DATA_URI = "recording_data_uri";















    field public static final java.lang.String COLUMN_RECORDING_DURATION_MILLIS = "recording_duration_millis";















    field public static final java.lang.String COLUMN_RECORDING_EXPIRE_TIME_UTC_MILLIS = "recording_expire_time_utc_millis";













    field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";













    field public static final java.lang.String COLUMN_SEASON_DISPLAY_NUMBER = "season_display_number";













    field public static final java.lang.String COLUMN_SEASON_TITLE = "season_title";













    field public static final java.lang.String COLUMN_SHORT_DESCRIPTION = "short_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_THUMBNAIL_URI = "thumbnail_uri";













    field public static final java.lang.String COLUMN_TITLE = "title";













    field public static final java.lang.String COLUMN_VERSION_NUMBER = "version_number";













    field public static final java.lang.String COLUMN_VIDEO_HEIGHT = "video_height";













    field public static final java.lang.String COLUMN_VIDEO_WIDTH = "video_width";















    field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/recorded_program";















    field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/recorded_program";















    field public static final android.net.Uri CONTENT_URI;

























api/test-current.txt



+27
−46


























File changed.
Preview size limit exceeded, changes collapsed.
























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



+332
−626


























File changed.
Preview size limit exceeded, changes collapsed.