summaryrefslogtreecommitdiffstats
path: root/api/current.txt
diff options
context:
space:
mode:
authorSungsoo Lim <sungsoo@google.com>2014-08-05 23:53:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-05 00:07:36 +0000
commit2df7e30839231afd83a3533320eb7797819beb20 (patch)
tree710c94c5f5e85dabbd1a9b5483c22f04c9c0cf25 /api/current.txt
parent1328569d330271edd11cea536761a07935f0cf4d (diff)
parent732be11cefc439ea47a6c9cced6ab240aa5f1ea9 (diff)
downloadframeworks_base-2df7e30839231afd83a3533320eb7797819beb20.zip
frameworks_base-2df7e30839231afd83a3533320eb7797819beb20.tar.gz
frameworks_base-2df7e30839231afd83a3533320eb7797819beb20.tar.bz2
Merge "TIF: Remove countryCode in TvContentRating" into lmp-dev
Diffstat (limited to 'api/current.txt')
-rw-r--r--api/current.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt
index 3929a75..425675b 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -16869,9 +16869,8 @@ package android.media.session {
package android.media.tv {
public final class TvContentRating {
- method public static android.media.tv.TvContentRating createRating(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String...);
+ method public static android.media.tv.TvContentRating createRating(java.lang.String, java.lang.String, java.lang.String, java.lang.String...);
method public java.lang.String flattenToString();
- method public java.lang.String getCountry();
method public java.lang.String getDomain();
method public java.lang.String getMainRating();
method public java.lang.String getRatingSystem();