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

am 38683808: am eede71e5: am aa5dbe63: Merge "TIF: Hide TvContract.Channels.COLUMN_BROWSABLE" into lmp-dev

Browse Source 
* commit '38683808a6b14a1a26ebddcba60f2261ff997054':
  TIF: Hide TvContract.Channels.COLUMN_BROWSABLE
This commit is contained in:
Youngsang Cho
2014-07-18 03:45:48 +00:00
committed by Android Git Automerger
parent 32e9d53123 686a8cfe7f
commit 96cdc2327c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -16467,7 +16467,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);
@@ -16483,7 +16482,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";

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

@@ -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 {
* </p><p>
* Type: INTEGER (boolean)
* </p>
* @hide
*/
public static final String COLUMN_BROWSABLE = "browsable";