Merge "TIF: Add TvContentRating constant for unrated content"
diff --git a/api/current.txt b/api/current.txt
index 17a8c30..f80083e 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -17824,6 +17824,7 @@
method public java.lang.String getRatingSystem();
method public java.util.List<java.lang.String> getSubRatings();
method public static android.media.tv.TvContentRating unflattenFromString(java.lang.String);
+ field public static final android.media.tv.TvContentRating UNRATED;
}
public final class TvContract {
diff --git a/api/system-current.txt b/api/system-current.txt
index 1563ce9..4ddb1a4 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -19109,6 +19109,7 @@
method public java.lang.String getRatingSystem();
method public java.util.List<java.lang.String> getSubRatings();
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 {
diff --git a/media/java/android/media/tv/TvContentRating.java b/media/java/android/media/tv/TvContentRating.java
index 69d7028..966e41a 100644
--- a/media/java/android/media/tv/TvContentRating.java
+++ b/media/java/android/media/tv/TvContentRating.java
@@ -696,6 +696,12 @@
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.
*
* @param domain The domain string. For example, "com.android.tv".