diff options
| author | 2017-02-28 20:36:40 +0000 | |
|---|---|---|
| committer | 2017-02-28 20:36:44 +0000 | |
| commit | 77dde67d64aa068db4d80fd144d2874a8fb88e37 (patch) | |
| tree | a8d70a0eaf6acf4b5009d914af13ca1bb8049a9a | |
| parent | 90ebaa8d2d720d30d453bac8995519fac459d840 (diff) | |
| parent | 3bfdf8ddf706cc5a425e191bb5bb985fd376f796 (diff) | |
Merge "TIF: make Channels.COLUMN_BROWSABLE visible"
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | media/java/android/media/tv/TvContract.java | 9 |
3 files changed, 7 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index 445c576cf091..ae8c2bdaeca2 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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"; diff --git a/api/test-current.txt b/api/test-current.txt index 500a0569bfd2..5d497fc7d008 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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"; diff --git a/media/java/android/media/tv/TvContract.java b/media/java/android/media/tv/TvContract.java index 1b53d72d6e55..19a2f615d823 100644 --- a/media/java/android/media/tv/TvContract.java +++ b/media/java/android/media/tv/TvContract.java @@ -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 |