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

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

Browse Source 
am: ca601d9303

* commit 'ca601d9303feb39ab164ddedfcb01225847fdc32':
  TIF: Unhide TvContract.Programs.Genres#isCanonical
This commit is contained in:
Dongwon Kang
2016-02-19 00:00:26 +00:00
committed by android-build-merger
parent 8f80296709 ca601d9303
commit d98c06cad3
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -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";

1
api/test-current.txt
View File

@@ -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";

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

@@ -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);
}