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

Merge "TvProvider API standardization for ARIB and DVB TvProvider"

Browse Source
This commit is contained in:
Henry Fang
2021-01-07 00:30:05 +00:00
committed by Gerrit Code Review
parent d5e143eee7 f56193551f
commit c8af272fb6
2 changed files with 70 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/api/current.txt
View File

@@ -23898,7 +23898,9 @@ package android.media.tv {
field public static final String COLUMN_APP_LINK_INTENT_URI = "app_link_intent_uri";
field public static final String COLUMN_APP_LINK_POSTER_ART_URI = "app_link_poster_art_uri";
field public static final String COLUMN_APP_LINK_TEXT = "app_link_text";
field public static final String COLUMN_BROADCAST_GENRE = "broadcast_genre";
field public static final String COLUMN_BROWSABLE = "browsable";
field public static final String COLUMN_CHANNEL_LIST_ID = "channel_list_id";
field public static final String COLUMN_DESCRIPTION = "description";
field public static final String COLUMN_DISPLAY_NAME = "display_name";
field public static final String COLUMN_DISPLAY_NUMBER = "display_number";
@@ -23913,6 +23915,8 @@ package android.media.tv {
field public static final String COLUMN_LOCKED = "locked";
field public static final String COLUMN_NETWORK_AFFILIATION = "network_affiliation";
field public static final String COLUMN_ORIGINAL_NETWORK_ID = "original_network_id";
field public static final String COLUMN_REMOTE_CONTROL_KEY_PRESET_NUMBER = "remote_control_key_preset_number";
field public static final String COLUMN_SCRAMBLED = "scrambled";
field public static final String COLUMN_SEARCHABLE = "searchable";
field public static final String COLUMN_SERVICE_ID = "service_id";
field public static final String COLUMN_SERVICE_TYPE = "service_type";
@@ -23921,6 +23925,7 @@ package android.media.tv {
field public static final String COLUMN_TYPE = "type";
field public static final String COLUMN_VERSION_NUMBER = "version_number";
field public static final String COLUMN_VIDEO_FORMAT = "video_format";
field public static final String COLUMN_VIDEO_RESOLUTION = "video_resolution";
field public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/channel";
field public static final String CONTENT_TYPE = "vnd.android.cursor.dir/channel";
field public static final android.net.Uri CONTENT_URI;

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

@@ -2450,6 +2450,71 @@ public final class TvContract {
*/
public static final String COLUMN_GLOBAL_CONTENT_ID = "global_content_id";
/**
* The remote control key preset number that is assigned to this channel.
*
* <p> This can be used for one-touch-tuning, tuning to the channel with
* pressing the preset button.
*
* <p> Type: INTEGER (remote control key preset number)
*/
public static final String COLUMN_REMOTE_CONTROL_KEY_PRESET_NUMBER =
"remote_control_key_preset_number";
/**
* The flag indicating whether this TV channel is scrambled or not.
*
* <p>Use the same coding for scrambled in the underlying broadcast standard
* if {@code free_ca_mode} in SDT is defined there (e.g. ETSI EN 300 468).
*
* <p>Type: INTEGER (boolean)
*/
public static final String COLUMN_SCRAMBLED = "scrambled";
/**
* The typical video resolution.
*
* <p>This is primarily used to filter out channels based on video resolution
* by applications. The value is from SDT if defined there. (e.g. ETSI EN 300 468)
* The value should match one of the followings: {@link #VIDEO_RESOLUTION_SD},
* {@link #VIDEO_RESOLUTION_HD}, {@link #VIDEO_RESOLUTION_UHD}.
*
* <p>Type: TEXT
*
*/
public static final String COLUMN_VIDEO_RESOLUTION = "video_resolution";
/**
* The channel list ID of this TV channel.
*
* <p>It is used to identify the channel list constructed from broadcast SI based on the
* underlying broadcast standard or country/operator profile, if applicable. Otherwise,
* leave empty.
*
* <p>The ID can be defined by individual TV input services. For example, one may assign a
* service operator name for the service operator channel list constructed from broadcast
* SI or one may assign the {@code profile_name} of the operator_info() APDU defined in CI
* Plus 1.3 for the dedicated CICAM operator profile channel list constructed
* from CICAM NIT.
*
* <p>Type: TEXT
*/
public static final String COLUMN_CHANNEL_LIST_ID = "channel_list_id";
/**
* The comma-separated genre string of this TV channel.
*
* <p>Use the same language appeared in the underlying broadcast standard, if applicable.
* Otherwise, leave empty. Use
* {@link Genres#encode Genres.encode()} to create a text that can be stored in this column.
* Use {@link Genres#decode Genres.decode()} to get the broadcast genre strings from the
* text stored in the column.
*
* <p>Type: TEXT
* @see Programs#COLUMN_BROADCAST_GENRE
*/
public static final String COLUMN_BROADCAST_GENRE = Programs.COLUMN_BROADCAST_GENRE;
private Channels() {}
/**