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

Merge "TIF: add COLUMN_SYSTEM_APPROVED in Channels"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-02-02 22:54:41 +00:00
committed by Android (Google) Code Review
parent 39455174d7 72529d0fa7
commit ec3211830e
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -25628,6 +25628,7 @@ package android.media.tv {
field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";
field public static final java.lang.String COLUMN_SERVICE_ID = "service_id";
field public static final java.lang.String COLUMN_SERVICE_TYPE = "service_type";
field public static final java.lang.String COLUMN_SYSTEM_APPROVED = "system_approved";
field public static final java.lang.String COLUMN_TRANSIENT = "transient";
field public static final java.lang.String COLUMN_TRANSPORT_STREAM_ID = "transport_stream_id";
field public static final java.lang.String COLUMN_TYPE = "type";

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

@@ -1026,6 +1026,19 @@ public final class TvContract {
@SystemApi
public static final String COLUMN_TRANSIENT = "transient";
/**
* The flag indicating whether this TV channel is approved to be shown by the system.
*
* <p>A value of 1 indicates that the channel is approved to be shown by the system, and a
* value of 0 indicates that the channel is blocked by system. If not specified, this value
* is set to 0 (not approved) by default.
*
* <p>Type: INTEGER (boolean)
* @hide
*/
@SystemApi
public static final String COLUMN_SYSTEM_APPROVED = "system_approved";
private Channels() {}
/**