diff options
| author | 2017-07-05 19:06:57 +0000 | |
|---|---|---|
| committer | 2017-07-05 19:06:57 +0000 | |
| commit | 93c2838ec1331977e2ab064af55e308b9ac1e8c7 (patch) | |
| tree | eb99811912c62e2ec4e9e167073fa3ec1f7e77ee | |
| parent | f4d4f9b91357cc354f5a150ddb8ab00bf45c016e (diff) | |
| parent | d3307ffc8a576d8509a3620b77d19bd387734231 (diff) | |
Merge "Create new permission READ_CONTENT_RATING_SYSTEMS"
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 9d116953992c..b9a8b20230c5 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -179,6 +179,7 @@ package android { field public static final java.lang.String READ_CALENDAR = "android.permission.READ_CALENDAR"; field public static final java.lang.String READ_CALL_LOG = "android.permission.READ_CALL_LOG"; field public static final java.lang.String READ_CONTACTS = "android.permission.READ_CONTACTS"; + field public static final java.lang.String READ_CONTENT_RATING_SYSTEMS = "android.permission.READ_CONTENT_RATING_SYSTEMS"; field public static final java.lang.String READ_DREAM_STATE = "android.permission.READ_DREAM_STATE"; field public static final java.lang.String READ_EXTERNAL_STORAGE = "android.permission.READ_EXTERNAL_STORAGE"; field public static final java.lang.String READ_FRAME_BUFFER = "android.permission.READ_FRAME_BUFFER"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 6fa91abf71a5..7555cabb9ae9 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2641,6 +2641,12 @@ <permission android:name="android.permission.MODIFY_PARENTAL_CONTROLS" android:protectionLevel="signature|privileged" /> + <!-- @SystemApi Allows an application to read TvContentRatingSystemInfo + <p>Not for use by third-party applications. + @hide --> + <permission android:name="android.permission.READ_CONTENT_RATING_SYSTEMS" + android:protectionLevel="signature|privileged" /> + <!-- @SystemApi Allows an application to notify TV inputs by sending broadcasts. <p>Protection level: signature|privileged <p>Not for use by third-party applications. |