Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca601d93 authored by Dongwon Kang's avatar Dongwon Kang Committed by Android (Google) Code Review
Browse files

Merge "TIF: Unhide TvContract.Programs.Genres#isCanonical" into nyc-dev

parents d08b5a11 d16d1f51

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

media/java/android/media/tv/TvContract.java

+1 −3
Original line number Diff line number Diff line
@@ -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);

            }