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

Commit 344f9e5e authored by Jae Seo's avatar Jae Seo Committed by Android (Google) Code Review
Browse files

Merge "TIF: Add TvContentRating constant for unrated content"

parents bf02d48f 7843e10e

api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -17824,6 +17824,7 @@ package android.media.tv { 
    method public java.lang.String getRatingSystem();

    method public java.lang.String getRatingSystem();

    method public java.util.List<java.lang.String> getSubRatings();

    method public java.util.List<java.lang.String> getSubRatings();

    method public static android.media.tv.TvContentRating unflattenFromString(java.lang.String);

    method public static android.media.tv.TvContentRating unflattenFromString(java.lang.String);

    field public static final android.media.tv.TvContentRating UNRATED;

  }

  }

















  public final class TvContract {







  public final class TvContract {

























api/system-current.txt



+1
−0




























Original line number
Original line
Diff line number
Diff line








@@ -19109,6 +19109,7 @@ package android.media.tv {









    method public java.lang.String getRatingSystem();







    method public java.lang.String getRatingSystem();











    method public java.util.List<java.lang.String> getSubRatings();







    method public java.util.List<java.lang.String> getSubRatings();











    method public static android.media.tv.TvContentRating unflattenFromString(java.lang.String);







    method public static android.media.tv.TvContentRating unflattenFromString(java.lang.String);














    field public static final android.media.tv.TvContentRating UNRATED;











  }







  }



























  public final class TvContentRatingSystemInfo implements android.os.Parcelable {







  public final class TvContentRatingSystemInfo implements android.os.Parcelable {

























media/java/android/media/tv/TvContentRating.java



+6
−0




























Original line number
Original line
Diff line number
Diff line








@@ -695,6 +695,12 @@ public final class TvContentRating {









    private final String[] mSubRatings;







    private final String[] mSubRatings;











    private final int mHashCode;







    private final int mHashCode;


































    /**














     * Rating constant denoting unrated content.














     */














    public static final TvContentRating UNRATED = new TvContentRating("com.android.tv", "",














            "UNRATED", null);


























    /**







    /**











     * Creates a {@code TvContentRating} object with predefined content rating strings.







     * Creates a {@code TvContentRating} object with predefined content rating strings.











     *







     *