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

Merge "TIF: Unhide URI util methods" into nyc-dev

Browse Source
This commit is contained in:
Jae Seo
2016-02-23 23:39:08 +00:00
committed by Android (Google) Code Review
parent e40cc28452 87079f1fd8
commit eefb17ac61
4 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -22757,6 +22757,10 @@ package android.media.tv {
method public static final android.net.Uri buildProgramsUriForChannel(long, long, long); method public static final android.net.Uri buildProgramsUriForChannel(long, long, long);
method public static final android.net.Uri buildProgramsUriForChannel(android.net.Uri, long, long); method public static final android.net.Uri buildProgramsUriForChannel(android.net.Uri, long, long);
method public static final android.net.Uri buildRecordedProgramUri(long); method public static final android.net.Uri buildRecordedProgramUri(long);
method public static final boolean isChannelUri(android.net.Uri);
method public static final boolean isChannelUriForPassthroughInput(android.net.Uri);
method public static final boolean isChannelUriForTunerInput(android.net.Uri);
method public static final boolean isProgramUri(android.net.Uri);
field public static final java.lang.String AUTHORITY = "android.media.tv"; field public static final java.lang.String AUTHORITY = "android.media.tv";
} }

3
api/system-current.txt
View File

@@ -24387,7 +24387,10 @@ package android.media.tv {
method public static final android.net.Uri buildProgramsUriForChannel(long, long, long); method public static final android.net.Uri buildProgramsUriForChannel(long, long, long);
method public static final android.net.Uri buildProgramsUriForChannel(android.net.Uri, long, long); method public static final android.net.Uri buildProgramsUriForChannel(android.net.Uri, long, long);
method public static final android.net.Uri buildRecordedProgramUri(long); method public static final android.net.Uri buildRecordedProgramUri(long);
method public static final boolean isChannelUri(android.net.Uri);
method public static final boolean isChannelUriForPassthroughInput(android.net.Uri); method public static final boolean isChannelUriForPassthroughInput(android.net.Uri);
method public static final boolean isChannelUriForTunerInput(android.net.Uri);
method public static final boolean isProgramUri(android.net.Uri);
field public static final java.lang.String AUTHORITY = "android.media.tv"; field public static final java.lang.String AUTHORITY = "android.media.tv";
} }

4
api/test-current.txt
View File

@@ -22766,6 +22766,10 @@ package android.media.tv {
method public static final android.net.Uri buildProgramsUriForChannel(long, long, long); method public static final android.net.Uri buildProgramsUriForChannel(long, long, long);
method public static final android.net.Uri buildProgramsUriForChannel(android.net.Uri, long, long); method public static final android.net.Uri buildProgramsUriForChannel(android.net.Uri, long, long);
method public static final android.net.Uri buildRecordedProgramUri(long); method public static final android.net.Uri buildRecordedProgramUri(long);
method public static final boolean isChannelUri(android.net.Uri);
method public static final boolean isChannelUriForPassthroughInput(android.net.Uri);
method public static final boolean isChannelUriForTunerInput(android.net.Uri);
method public static final boolean isProgramUri(android.net.Uri);
field public static final java.lang.String AUTHORITY = "android.media.tv"; field public static final java.lang.String AUTHORITY = "android.media.tv";
} }

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

@@ -312,33 +312,28 @@ public final class TvContract {
} }
/** /**
* Returns true, if {@code uri} is a channel URI. * Returns {@code true}, if {@code uri} is a channel URI.
* @hide
*/ */
public static final boolean isChannelUri(Uri uri) { public static final boolean isChannelUri(Uri uri) {
return isChannelUriForTunerInput(uri) || isChannelUriForPassthroughInput(uri); return isChannelUriForTunerInput(uri) || isChannelUriForPassthroughInput(uri);
} }
/** /**
* Returns true, if {@code uri} is a channel URI for a tuner input. * Returns {@code true}, if {@code uri} is a channel URI for a tuner input.
* @hide
*/ */
public static final boolean isChannelUriForTunerInput(Uri uri) { public static final boolean isChannelUriForTunerInput(Uri uri) {
return isTvUri(uri) && isTwoSegmentUriStartingWith(uri, PATH_CHANNEL); return isTvUri(uri) && isTwoSegmentUriStartingWith(uri, PATH_CHANNEL);
} }
/** /**
* Returns true, if {@code uri} is a channel URI for a passthrough input. * Returns {@code true}, if {@code uri} is a channel URI for a pass-through input.
* @hide
*/ */
@SystemApi
public static final boolean isChannelUriForPassthroughInput(Uri uri) { public static final boolean isChannelUriForPassthroughInput(Uri uri) {
return isTvUri(uri) && isTwoSegmentUriStartingWith(uri, PATH_PASSTHROUGH); return isTvUri(uri) && isTwoSegmentUriStartingWith(uri, PATH_PASSTHROUGH);
} }
/** /**
* Returns true, if {@code uri} is a program URI. * Returns {@code true}, if {@code uri} is a program URI.
* @hide
*/ */
public static final boolean isProgramUri(Uri uri) { public static final boolean isProgramUri(Uri uri) {
return isTvUri(uri) && isTwoSegmentUriStartingWith(uri, PATH_PROGRAM); return isTvUri(uri) && isTwoSegmentUriStartingWith(uri, PATH_PROGRAM);