diff --git a/api/current.txt b/api/current.txt index 01bdc644acfb3..9180dabdd3926 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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(android.net.Uri, long, 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"; } diff --git a/api/system-current.txt b/api/system-current.txt index 13f3998e50ba9..dc08cd39bae89 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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(android.net.Uri, long, 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"; } diff --git a/api/test-current.txt b/api/test-current.txt index 71f1c680b0a5e..bad08686bab3b 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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(android.net.Uri, long, 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"; } diff --git a/media/java/android/media/tv/TvContract.java b/media/java/android/media/tv/TvContract.java index 5cf68112f0f6c..95354456209cb 100644 --- a/media/java/android/media/tv/TvContract.java +++ b/media/java/android/media/tv/TvContract.java @@ -312,33 +312,28 @@ public final class TvContract { } /** - * Returns true, if {@code uri} is a channel URI. - * @hide + * Returns {@code true}, if {@code uri} is a channel URI. */ public static final boolean isChannelUri(Uri uri) { return isChannelUriForTunerInput(uri) || isChannelUriForPassthroughInput(uri); } /** - * Returns true, if {@code uri} is a channel URI for a tuner input. - * @hide + * Returns {@code true}, if {@code uri} is a channel URI for a tuner input. */ public static final boolean isChannelUriForTunerInput(Uri uri) { return isTvUri(uri) && isTwoSegmentUriStartingWith(uri, PATH_CHANNEL); } /** - * Returns true, if {@code uri} is a channel URI for a passthrough input. - * @hide + * Returns {@code true}, if {@code uri} is a channel URI for a pass-through input. */ - @SystemApi public static final boolean isChannelUriForPassthroughInput(Uri uri) { return isTvUri(uri) && isTwoSegmentUriStartingWith(uri, PATH_PASSTHROUGH); } /** - * Returns true, if {@code uri} is a program URI. - * @hide + * Returns {@code true}, if {@code uri} is a program URI. */ public static final boolean isProgramUri(Uri uri) { return isTvUri(uri) && isTwoSegmentUriStartingWith(uri, PATH_PROGRAM);