From 6440db358c6aac2c1b5752e25c9386bae824bfd4 Mon Sep 17 00:00:00 2001
From: Youngsang Cho
Date: Wed, 16 Jul 2014 18:45:09 -0700
Subject: [PATCH] TIF: Hide TvContract.Channels.COLUMN_BROWSABLE
TODO: Remove BROWSABLE in TvContract, TvProvider and TV app.
Bug: 16195951
Change-Id: I20e8e1e2f93e0133eba3694e0c1724d443250e59
---
api/current.txt | 2 --
media/java/android/media/tv/TvContract.java | 6 ++++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/api/current.txt b/api/current.txt
index e182c0aa16b9e..14936d84a5b71 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -16465,7 +16465,6 @@ package android.media.tv {
method public static final android.net.Uri buildChannelLogoUri(android.net.Uri);
method public static final android.net.Uri buildChannelUri(long);
method public static final android.net.Uri buildChannelsUriForInput(java.lang.String);
- method public static final android.net.Uri buildChannelsUriForInput(java.lang.String, boolean);
method public static final java.lang.String buildInputId(android.content.ComponentName);
method public static final android.net.Uri buildProgramUri(long);
method public static final android.net.Uri buildProgramsUriForChannel(long);
@@ -16481,7 +16480,6 @@ package android.media.tv {
public static final class TvContract.Channels implements android.media.tv.TvContract.BaseTvColumns {
method public static final java.lang.String getVideoResolution(java.lang.String);
- field public static final java.lang.String COLUMN_BROWSABLE = "browsable";
field public static final java.lang.String COLUMN_CONDITIONAL_ACCESS = "conditional_access";
field public static final java.lang.String COLUMN_DESCRIPTION = "description";
field public static final java.lang.String COLUMN_DISPLAY_NAME = "display_name";
diff --git a/media/java/android/media/tv/TvContract.java b/media/java/android/media/tv/TvContract.java
index 8a2ee8eef36bd..7d189e4dc51c1 100644
--- a/media/java/android/media/tv/TvContract.java
+++ b/media/java/android/media/tv/TvContract.java
@@ -128,12 +128,12 @@ public final class TvContract {
}
/**
- * Builds a URI that points to all browsable channels from a given TV input.
+ * Builds a URI that points to all channels from a given TV input.
*
* @param inputId The ID of the TV input to build a channels URI for.
*/
public static final Uri buildChannelsUriForInput(String inputId) {
- return buildChannelsUriForInput(inputId, true);
+ return buildChannelsUriForInput(inputId, false);
}
/**
@@ -143,6 +143,7 @@ public final class TvContract {
* @param browsableOnly If set to {@code true} the URI points to only browsable channels. If set
* to {@code false} the URI points to all channels regardless of whether they are
* browsable or not.
+ * @hide
*/
public static final Uri buildChannelsUriForInput(String inputId, boolean browsableOnly) {
return new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT).authority(AUTHORITY)
@@ -656,6 +657,7 @@ public final class TvContract {
*
* Type: INTEGER (boolean)
*
+ * @hide
*/
public static final String COLUMN_BROWSABLE = "browsable";