From 87079f1fd83c51bb7048cda9647257e01c2f97a3 Mon Sep 17 00:00:00 2001 From: Jae Seo Date: Tue, 23 Feb 2016 14:57:02 -0800 Subject: [PATCH] TIF: Unhide URI util methods Bug: 27314735 Change-Id: Ib2aeb451a435bb959efb1cba359c335b051f88e5 --- api/current.txt | 4 ++++ api/system-current.txt | 3 +++ api/test-current.txt | 4 ++++ media/java/android/media/tv/TvContract.java | 13 ++++--------- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/api/current.txt b/api/current.txt index c7815fa2a18ad..486a0f8f20fdc 100644 --- a/api/current.txt +++ b/api/current.txt @@ -22756,6 +22756,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 990f09436b6bd..faf584e99e87b 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -24386,7 +24386,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 79351ece34abb..a9c3a6ae64266 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -22765,6 +22765,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);