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

Merge "TIF: make Channels.COLUMN_BROWSABLE visible"

Browse Source
This commit is contained in:
Dongwon Kang
2017-02-28 20:36:40 +00:00
committed by Android (Google) Code Review
parent 90ebaa8d2d 3bfdf8ddf7
commit 77dde67d64
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -24175,6 +24175,7 @@ package android.media.tv {
field public static final java.lang.String COLUMN_APP_LINK_INTENT_URI = "app_link_intent_uri";
field public static final java.lang.String COLUMN_APP_LINK_POSTER_ART_URI = "app_link_poster_art_uri";
field public static final java.lang.String COLUMN_APP_LINK_TEXT = "app_link_text";
field public static final java.lang.String COLUMN_BROWSABLE = "browsable";
field public static final java.lang.String COLUMN_DESCRIPTION = "description";
field public static final java.lang.String COLUMN_DISPLAY_NAME = "display_name";
field public static final java.lang.String COLUMN_DISPLAY_NUMBER = "display_number";

1
api/test-current.txt
View File

@@ -24271,6 +24271,7 @@ package android.media.tv {
field public static final java.lang.String COLUMN_APP_LINK_INTENT_URI = "app_link_intent_uri";
field public static final java.lang.String COLUMN_APP_LINK_POSTER_ART_URI = "app_link_poster_art_uri";
field public static final java.lang.String COLUMN_APP_LINK_TEXT = "app_link_text";
field public static final java.lang.String COLUMN_BROWSABLE = "browsable";
field public static final java.lang.String COLUMN_DESCRIPTION = "description";
field public static final java.lang.String COLUMN_DISPLAY_NAME = "display_name";
field public static final java.lang.String COLUMN_DISPLAY_NUMBER = "display_number";

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

@@ -1279,14 +1279,15 @@ public final class TvContract {
/**
* The flag indicating whether this TV channel is browsable or not.
*
* <p>This column can only be set by applications having proper system permission. For
* other applications, this is a read-only column.
*
* <p>A value of 1 indicates the channel is included in the channel list that applications
* use to browse channels, a value of 0 indicates the channel is not included in the list.
* If not specified, this value is set to 0 (not browsable) by default.
*
* <p>Type: INTEGER (boolean)
* @hide
*/
@SystemApi
public static final String COLUMN_BROWSABLE = "browsable";
/**
@@ -2609,8 +2610,8 @@ public final class TvContract {
/**
* The flag indicating whether this TV program is browsable or not.
*
* <p>This column can only be set by system apps. For other applications, it is a read-only
* column. Trying to modify it may cause {@link SecurityException}.
* <p>This column can only be set by applications having proper system permission. For
* other applications, this is a read-only column.
*
* <p>A value of 1 indicates that the program is browsable and can be shown to users in
* the UI. A value of 0 indicates that the program should be hidden from users and the