| d3f17921bde06c0bd164f0abf0e99dafc7c0c569 |
|
19-Sep-2014 |
Sungsoo Lim <sungsoo@google.com> |
Update java doc for content rating systems
- DVB and ISDB ratings are added.
- Remove rating systems whose countries uses DVB and ISDB.
- Updated java doc for AR, AU, and BR.
Bug: 17494772
Change-Id: Ia2a63c7914148b42078decb8de1ae45baefb010d
/frameworks/base/media/java/android/media/tv/TvContentRating.java
|
| fe5998b5add1e96eafd5583528bfc8d9874a4123 |
|
09-Sep-2014 |
Jae Seo <jaeseo@google.com> |
Add Japanese content ratings
Bug: 17434802
Change-Id: I4be1ff9e5621f0a973c38f1abb377b1c92131a02
/frameworks/base/media/java/android/media/tv/TvContentRating.java
|
| 0a514c0a87fe3f3a7a8ed973f68c2fc23d242baf |
|
04-Sep-2014 |
Jae Seo <jaeseo@google.com> |
TIF: Add Quebec ratings for Canada and fix the XML example
Bug: 17332911, Bug: 17321648
Change-Id: Ice884ecdeda246e978ab235913e3e92d0c1e6ec2
/frameworks/base/media/java/android/media/tv/TvContentRating.java
|
| 3652e1d8b879fd8e96e8f4e09cefea3c05aa4857 |
|
02-Sep-2014 |
Jae Seo <jaeseo@google.com> |
TIF: Fix the Singapore content ratings
It is not that Singapore has two different rating systems. There is just one
rating system from Board of Film Censors but each broadcaster uses a different
subset of ratings. For example, Free-To-Air uses PG and PG13 while Pay TV uses
NC16 and M18 ratings in addition to the PG and PG13.
Bug: 17330613
Change-Id: I5a5e47706e7415f13a5e7dc9c00cc2c3c3763965
/frameworks/base/media/java/android/media/tv/TvContentRating.java
|
| f7255fcc149041ac5c7d91a13e63a9a09d70a13f |
|
30-Aug-2014 |
Jae Seo <jaeseo@google.com> |
Merge "TIF: Fix comment on TvContentRating" into lmp-dev
|
| b417c9d0e2819e1108b2c3e8dd7c8ea8eae57e6f |
|
30-Aug-2014 |
Jae Seo <jaeseo@google.com> |
TIF: Fix comment on TvContentRating
Bug: 17332911
Change-Id: Ia2d76b2c6ecf6b804f8b6aa8cec78a243b70e966
/frameworks/base/media/java/android/media/tv/TvContentRating.java
|
| 51374011a85e7f5860766c4f56cd73ff39e77528 |
|
29-Aug-2014 |
Andrew Jeon <jeon@google.com> |
Replace "Comment" to "Description" since description makes more sense in
the context of the java doc.
Change-Id: Id7c2bb76d792680eb6d674cd01290272de723b92
/frameworks/base/media/java/android/media/tv/TvContentRating.java
|
| 9c165d6e9a2f085fbdc87b9221f2d52d851b2652 |
|
25-Aug-2014 |
Jae Seo <jaeseo@google.com> |
TIF: Enable applications to register custom content rating systems
A recent change that moved the string resource for the system supported
content ratings from the framework to the TV app led to a need for
allowing the TV app to publish its own content rating systems. This
change added an intent action and a metadata key to be used by the TV
input manager service for querying available content rating systems,
similarly to the way InputManager defined ACTION_QUERY_KEYBOARD_LAYOUTS
and META_DATA_KEYBOARD_LAYOUTS for custom keyboard layouts. Applications
now can register their own rating systems simply by declaring a
broadcast receiver in their manifests.
Bug: 17167287, Bug: 17114406
Change-Id: I1808c624014b603ea709714737c2a880714bdc0a
/frameworks/base/media/java/android/media/tv/TvContentRating.java
|
| b2835e2700a200b368a8247739648601d79e2b06 |
|
26-Aug-2014 |
Jae Seo <jaeseo@google.com> |
TIF: Make TV content rating names consistent
Bug: 17275999
Change-Id: I79e9ce180b23b37799f0e7daffa7778bff9cd3e4
/frameworks/base/media/java/android/media/tv/TvContentRating.java
|
| ceb51abc74129f5c736ba5aa0400c45f1c4752ac |
|
22-Aug-2014 |
Jae Seo <jaeseo@google.com> |
TIF: Fix comments in TvContentRating
Bug: 16876068
Change-Id: I4c8be4ecbbdefac8e85531fa9b918f454b9e45d8
/frameworks/base/media/java/android/media/tv/TvContentRating.java
|
| 14355950d5ce42b8043cfb96d192f1c76b93d496 |
|
20-Aug-2014 |
Jae Seo <jaeseo@google.com> |
API Review: android.media.tv
TvContentRating:
- The XML file: attributes should have android: prefix and should allow
string resource references for labels.
Bug: 17114406
Change-Id: Ife2f4dc6c2c8a5a1714cdeedb27aab40fce73e2b
/frameworks/base/media/java/android/media/tv/TvContentRating.java
|
| fc27d6db089d25ab752c0445016fd07760c345f8 |
|
14-Aug-2014 |
Jae Seo <jaeseo@google.com> |
TIF: Rename R.attr.contentRatingSystemXml and fix documentation
- Rename contentRatingSystemXml to tvContentRatingDescription.
- Change docs to indicate this is a reference to an XML document that
describes TV content rating, not a component name.
- Replace the DTD with an XML example.
Bug: 16960702
Change-Id: Iea985e9847ee5af0f745e896c498792234308b12
/frameworks/base/media/java/android/media/tv/TvContentRating.java
|
| 1d1164012740a486b3074b50d8d2a9c452dbfecc |
|
14-Aug-2014 |
Sungsoo Lim <sungsoo@google.com> |
Update Java doc for TV Rating system
Bug: 17007100
Change-Id: Idb3f2184ea6d0421875ccd1e10b7539b3c17080a
/frameworks/base/media/java/android/media/tv/TvContentRating.java
|
| a9a29a29e55380ebd30175a75b285b16201002b6 |
|
13-Aug-2014 |
Sungsoo Lim <sungsoo@google.com> |
Fix hashCode of TvContentRating
Bug: 16963556
Change-Id: I0d419e4a47cd4b0a364d3b05063dcdbfc8a168ae
/frameworks/base/media/java/android/media/tv/TvContentRating.java
|
| 1681ac0b690b8888858ab402742dd8eb285518d0 |
|
12-Aug-2014 |
Sungsoo Lim <sungsoo@google.com> |
Add equals method of TvContentRating
Bug: 16963556
Change-Id: I09869d322fc2056ef1df5d2ca95891263646b46f
/frameworks/base/media/java/android/media/tv/TvContentRating.java
|
| 22f7c4769f7f77f54e384794f0e74bd50a46417a |
|
12-Aug-2014 |
Jaewan Kim <jaewan@google.com> |
Merge "Treat empty subrating as the same as null subratings." into lmp-dev
|
| d22e37acac3a83199423692671e2b20050088426 |
|
12-Aug-2014 |
Jaewan Kim <jaewan@google.com> |
Treat empty subrating as the same as null subratings.
Change-Id: Ic288c680c639ccba6cf593d1286776a6c891b726
/frameworks/base/media/java/android/media/tv/TvContentRating.java
|
| 6219fa8b2d1a31bd3e436878c92cd27e3be4d822 |
|
12-Aug-2014 |
Sungsoo Lim <sungsoo@google.com> |
Add version attribute in tv_content_rating_system.xml
- 'version' attribute is added in 'rating-system-definitions' tag.
- Update javadoc for the format change of XML file in TvContentRating.
- Fix some errors in the javadoc comment.
Bug: 16805703
Change-Id: If9473c89cef0777232470d67f1542a5e5eac3182
/frameworks/base/media/java/android/media/tv/TvContentRating.java
|
| 98ea5fa8e4a99433da0c32273674af189c65f14b |
|
10-Aug-2014 |
Sungsoo Lim <sungsoo@google.com> |
TIF: Add content rating systems
- Change the strings for translation to English only.
- Add content rating systems for many countries.
- Update javadoc of TvContentRating which is auto-generated based on
tv_content_rating_systems.xml and strings.xml
Bug: 16862855, Bug: 16889743
Change-Id: Ifd81c85934b8631e8ae00633639989275982ecfb
/frameworks/base/media/java/android/media/tv/TvContentRating.java
|
| 546c635ad9a26421fbdf54efa765b5ab0a63c191 |
|
07-Aug-2014 |
Jae Seo <jaeseo@google.com> |
TIF: Change CEC specific names to more general ones
Now MHL device information is also a part of HdmiDeviceInfo (previously
HdmiCecDeviceInfo). This change adjusts method/variable names across our code
base to reflect that.
Bug: 16215362
Change-Id: I7a6692329f39842a4aec9a4ff036eca5474cfd33
/frameworks/base/media/java/android/media/tv/TvContentRating.java
|
| b4bbfbcef3dec8f0de13a6ee474858f3a3cd535d |
|
06-Aug-2014 |
Sungsoo Lim <sungsoo@google.com> |
TIF: Add a content rating system for Brazil
- Add Brazil TV content ratings
- Remove Italy TV content rating since it doesn't have the official one.
References:
http://en.wikipedia.org/wiki/Brazilian_Advisory_Rating_System
http://portal.mj.gov.br/services/DocumentManagement/FileDownload.EZTSvc.asp?DocumentID=%7B25A80220-B0E3-47FD-923F-246B6184C3C6%7D&ServiceInstUID=%7B59D015FA-30D3-48EE-B124-02A314CB7999%7D
Change-Id: Ibed9b4be0871b50b9dcd95be3a015f5a1e58676d
/frameworks/base/media/java/android/media/tv/TvContentRating.java
|
| 1fd38bd99610d7dc2a9c335ae2af4089fe1006a1 |
|
05-Aug-2014 |
Sungsoo Lim <sungsoo@google.com> |
TIF: Add content ratings for Australia
Reference: http://www.classification.gov.au/
Change-Id: I79a85124df7e06418ff95ca39ef1db98a83c5af1
/frameworks/base/media/java/android/media/tv/TvContentRating.java
|
| b1caf4d8178be53b432399747b5114275c200e43 |
|
05-Aug-2014 |
Dongwon Kang <dwkang@google.com> |
TIF: Add content rating system for Spain
References:
- http://codigodeautorregulacion.rtve.es/senalizacion-de-los-programas/advertencias-opticas/
- http://en.wikipedia.org/wiki/RTVE
Change-Id: Icdde8a7f8cfb07cc4f768f95ba764ae6a519e347
/frameworks/base/media/java/android/media/tv/TvContentRating.java
|
| 8811f3457eacf5fae9bc7c3b5b0775c5f23abb63 |
|
06-Aug-2014 |
Sungsoo Lim <sungsoo@google.com> |
Merge "TIF: Add content ratings for Netherlands" into lmp-dev
|
| 3596a9645eae5636706d6d76b3d0e321c3d5c11f |
|
04-Aug-2014 |
Sungsoo Lim <sungsoo@google.com> |
TIF: Add content ratings for Netherlands
Change-Id: I17bac9587ea549f5e22bfe9c03fa50999fee5d5f
/frameworks/base/media/java/android/media/tv/TvContentRating.java
|
| 2df7e30839231afd83a3533320eb7797819beb20 |
|
06-Aug-2014 |
Sungsoo Lim <sungsoo@google.com> |
Merge "TIF: Remove countryCode in TvContentRating" into lmp-dev
|
| 39ddf8ddc4e32e640e3e3df490312878554d6d1d |
|
06-Aug-2014 |
Sungsoo Lim <sungsoo@google.com> |
Merge "TIF: Add content ratings for Germany" into lmp-dev
|
| 6b444eed2cbc6b124c9cfabb47fd924d7a55aa99 |
|
05-Aug-2014 |
Sungsoo Lim <sungsoo@google.com> |
TIF: Add content ratings for Germany
Change-Id: I7233e5d10550d6e6d2ef6f7c1c4ebd71bc271539
/frameworks/base/media/java/android/media/tv/TvContentRating.java
|
| 4acc7c3f4e1d63e702b9a4782b01e4a4ef152e71 |
|
04-Aug-2014 |
Sungsoo Lim <sungsoo@google.com> |
TIF: Add content ratings for France
Change-Id: Ib90a9ab918a6a7187a05323fe0f0122ffe747add
/frameworks/base/media/java/android/media/tv/TvContentRating.java
|
| e6dca2cfa4eecd3a45792703b722fc3ef86e8744 |
|
05-Aug-2014 |
Sungsoo Lim <sungsoo@google.com> |
TIF: A preliminary CL to add multiple rating systems
TODO: Add rating systems for the countries defined in this CL.
Change-Id: I128284fd8779723b5ffb5968e2a11ce4b4eae6b5
/frameworks/base/media/java/android/media/tv/TvContentRating.java
|
| 732be11cefc439ea47a6c9cced6ab240aa5f1ea9 |
|
04-Aug-2014 |
Sungsoo Lim <sungsoo@google.com> |
TIF: Remove countryCode in TvContentRating
In the standard TV content rating systems, there are no cases that
a TV content rating system is used for multiple countries.
Moreover, since we allow the case that the country code is null for
a custom rating system (e.g. YT), the country code should be removed.
Change-Id: I79472dbd491aa7efb40f3e081f90b45e13a91505
/frameworks/base/media/java/android/media/tv/TvContentRating.java
|
| 5c5b83fcd58d21c9ab7ac986bf84f604ec5bb4b5 |
|
29-Jul-2014 |
Sungsoo Lim <sungsoo@google.com> |
TIF: Use XML file for representing TvContentRating
This change addresses the following API council feedback.
- Remove all constants from TvContentRating. Instead this class becomes a
general parser for a tuple of "rating domain"+type+subtype(s).
- Instead of constants in the API, the rating definitions should come from
parsed XML meta-data tied to a TvInputService entry in the AndroidManifest.
This XML should define a ranked order of the rating constants along with
@string references for displaying in the Settings UI. Mention that the
"rating domain" should be scoped similar to a package name, for example
"com.youtube.ratings".
- For system-defined rating types (like US, Korea, etc) we should parse this
same XML format, but it may come from a hard-coded XML resource (since they
aren't tied to a single TvInputService.)
- Thoroughly document the built-in supported types in javadoc on TvContentRating.
Change-Id: I0a9526c73c8ca67fd0eeac63f3c63c05657a45e3
/frameworks/base/media/java/android/media/tv/TvContentRating.java
|
| 6057102dbb746593a7d59cf377c969b62e38c664 |
|
15-Jul-2014 |
Jae Seo <jaeseo@google.com> |
TIF: Add TvParentalControlManager
Each TV input service is now required to query the system whether the
user is allowed to watch the current program before showing it to the
user if the parental control is turned on, which can be checked by
calling TvParentalControlManager.isEnabled(). Whether the TV input
service should block the content or not is determined by invoking
TvParentalControlManager.isRatingBlocked() with the content rating for
the current program. Then the TvParentalControlManager makes a judgment
based on the user blocked ratings stored in the secure settings and
returns the result. If the rating in question turns out to be blocked,
the TV input service must immediately block the content and call this
method with the content rating of the current program to prompt the PIN
verification screen.
Each TV input service also needs to continuously listen to any changes
made to the parental control settings by registering a
TvParentalControlManager.ParentalControlCallback() to the manager and
immediately reevaluate the current program with the new parental control
settings.
Bug: 13172379
Change-Id: I8e1900d4b8d28c56798986d5c3906bd418ab97ac
/frameworks/base/media/java/android/media/tv/TvContentRating.java
|
| e16873467cda89d905027458e2664c759465d463 |
|
10-Jul-2014 |
Sungsoo Lim <sungsoo@google.com> |
Implement TvContentRating
Added a class that represents TV content ratings that are used for
parental controls. TV input services are required to create
TvContentRating objects with rating/sub-rating constants for specific
countries (for now US and KR only) defined in this class and then
convert them into strings in order to store them in the EPG database.
Bug: 13172379
Change-Id: I6200cb12fbc274dd0a8bcb87a8ac3cd2d96791db
/frameworks/base/media/java/android/media/tv/TvContentRating.java
|