diff --git a/api/current.txt b/api/current.txt index f1f823a420433..e2907976d6bdf 100644 --- a/api/current.txt +++ b/api/current.txt @@ -22854,6 +22854,7 @@ package android.media.tv { public static final class TvContract.Programs.Genres { method public static java.lang.String[] decode(java.lang.String); method public static java.lang.String encode(java.lang.String...); + method public static boolean isCanonical(java.lang.String); field public static final java.lang.String ANIMAL_WILDLIFE = "ANIMAL_WILDLIFE"; field public static final java.lang.String ARTS = "ARTS"; field public static final java.lang.String COMEDY = "COMEDY"; diff --git a/api/test-current.txt b/api/test-current.txt index 2a66162f0aba6..dda10b808c6ef 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -22863,6 +22863,7 @@ package android.media.tv { public static final class TvContract.Programs.Genres { method public static java.lang.String[] decode(java.lang.String); method public static java.lang.String encode(java.lang.String...); + method public static boolean isCanonical(java.lang.String); field public static final java.lang.String ANIMAL_WILDLIFE = "ANIMAL_WILDLIFE"; field public static final java.lang.String ARTS = "ARTS"; field public static final java.lang.String COMEDY = "COMEDY"; diff --git a/media/java/android/media/tv/TvContract.java b/media/java/android/media/tv/TvContract.java index 9203ef2bf1b4f..7b8e4b2e2ee65 100644 --- a/media/java/android/media/tv/TvContract.java +++ b/media/java/android/media/tv/TvContract.java @@ -1394,13 +1394,11 @@ public final class TvContract { } /** - * Check whether a given genre is canonical or not. + * Returns whether a given text is a canonical genre defined in {@link Genres}. * * @param genre The name of genre to be checked. * @return {@code true} if the genre is canonical, otherwise {@code false}. - * @hide */ - @SystemApi public static boolean isCanonical(String genre) { return CANONICAL_GENRES.contains(genre); }