From 3bfdf8ddf706cc5a425e191bb5bb985fd376f796 Mon Sep 17 00:00:00 2001 From: Dongwon Kang Date: Tue, 21 Feb 2017 18:06:51 -0800 Subject: [PATCH] TIF: make Channels.COLUMN_BROWSABLE visible Test: cts-tradefed run cts -m CtsTvTestCases Bug: 35249360 Change-Id: I16570f2432a4bf7b2b7c18edd3d2a461927453da --- api/current.txt | 1 + api/test-current.txt | 1 + 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 5e7253d961500..aaeea870d5695 100644 --- a/api/current.txt +++ b/api/current.txt @@ -24139,6 +24139,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 e430e022c5ec3..5a9cccd81f3ac 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -24235,6 +24235,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 1b53d72d6e551..19a2f615d823e 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. * + *

This column can only be set by applications having proper system permission. For + * other applications, this is a read-only column. + * *

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. * *

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. * - *

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}. + *

This column can only be set by applications having proper system permission. For + * other applications, this is a read-only column. * *

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