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

am c83c5596: am e188fc30: Merge "Add Japanese content ratings" into lmp-dev

Browse Source 
* commit 'c83c5596bf4f2e463ca54d12e566f4c04b9c55aa':
  Add Japanese content ratings
This commit is contained in:
Jae Seo
2014-09-09 17:42:04 +00:00
committed by Android Git Automerger
parent c8cc92f852 2c42ed0b41
commit 8e036f3a83
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
media/java/android/media/tv/TvContentRating.java
View File

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