diff options
| author | Jae Seo <jaeseo@google.com> | 2014-09-09 10:02:37 -0700 |
|---|---|---|
| committer | Jae Seo <jaeseo@google.com> | 2014-09-09 10:06:52 -0700 |
| commit | fe5998b5add1e96eafd5583528bfc8d9874a4123 (patch) | |
| tree | cd8cb07bfc62fe2d47da2f532cd86345f85ec616 /media/java | |
| parent | fbc3f1984a1630186b8f37f8be951ae3033441ce (diff) | |
| download | frameworks_base-fe5998b5add1e96eafd5583528bfc8d9874a4123.zip frameworks_base-fe5998b5add1e96eafd5583528bfc8d9874a4123.tar.gz frameworks_base-fe5998b5add1e96eafd5583528bfc8d9874a4123.tar.bz2 | |
Add Japanese content ratings
Bug: 17434802
Change-Id: I4be1ff9e5621f0a973c38f1abb377b1c92131a02
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/tv/TvContentRating.java | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/media/java/android/media/tv/TvContentRating.java b/media/java/android/media/tv/TvContentRating.java index 7d1c7c6..b4ec2b3 100644 --- a/media/java/android/media/tv/TvContentRating.java +++ b/media/java/android/media/tv/TvContentRating.java @@ -247,6 +247,10 @@ import java.util.Objects; * <td>TV content rating system for Iceland</td> * </tr> * <tr> + * <td>JP_TV</td> + * <td>TV content rating system for Japan</td> + * </tr> + * <tr> * <td>KR_TV</td> * <td>TV content rating system for South Korea</td> * </tr> @@ -912,6 +916,23 @@ import java.util.Objects; * <td>Programs suitable for ages 18 and older</td> * </tr> * <tr> + * <td valign="top" rowspan="4">JP_TV</td> + * <td>JP_TV_G</td> + * <td>General, suitable for all ages</td> + * </tr> + * <tr> + * <td>JP_TV_PG12</td> + * <td>Parental guidance requested for young people under 12 years</td> + * </tr> + * <tr> + * <td>JP_TV_R15</td> + * <td>For persons aged 15 and above only</td> + * </tr> + * <tr> + * <td>JP_TV_R18</td> + * <td>For persons aged 18 and above only</td> + * </tr> + * <tr> * <td valign="top" rowspan="5">KR_TV</td> * <td>KR_TV_ALL</td> * <td>Appropriate for all ages</td> |