diff options
| author | Jeff Tinker <jtinker@google.com> | 2014-04-02 12:23:56 -0700 |
|---|---|---|
| committer | Jeff Tinker <jtinker@google.com> | 2014-04-02 16:43:10 -0700 |
| commit | 65c94e695929ffa1aaa49d7b5938b34aaf078b6c (patch) | |
| tree | e8349b6e558379ef090df4b3701d624436ec477f /core | |
| parent | e4095a80b674642e0e0e8f0883dee3b22f32f19a (diff) | |
| download | frameworks_base-65c94e695929ffa1aaa49d7b5938b34aaf078b6c.zip frameworks_base-65c94e695929ffa1aaa49d7b5938b34aaf078b6c.tar.gz frameworks_base-65c94e695929ffa1aaa49d7b5938b34aaf078b6c.tar.bz2 | |
Add signature|system permission to MediaDrm signer APIs
Also addresses style issues noted in post-submit review from
https://googleplex-android-review.git.corp.google.com/#/c/439054/
Change-Id: If177b11dbcc049bc271529c119bc5c36ae0107b5
related-to-bug: 12702350
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/AndroidManifest.xml | 7 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 086a2b1..b67a5a3 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2519,6 +2519,13 @@ android:description="@string/permdesc_accessNetworkConditions" android:protectionLevel="signature|system" /> + <!-- Allows an application to provision and access DRM certificates + @hide This is not a third-party API (intended for system apps). --> + <permission android:name="android.permission.ACCESS_DRM_CERTIFICATES" + android:label="@string/permlab_accessDrmCertificates" + android:description="@string/permdesc_accessDrmCertificates" + android:protectionLevel="signature|system" /> + <!-- The system process is explicitly the only one allowed to launch the confirmation UI for full backup/restore --> <uses-permission android:name="android.permission.CONFIRM_FULL_BACKUP"/> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 30243a4..5748e72 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1985,6 +1985,11 @@ <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permdesc_accessNetworkConditions">Allows an application to listen for observations on network conditions. Should never be needed for normal apps.</string> + <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> + <string name="permlab_accessDrmCertificates">access DRM certificates</string> + <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> + <string name="permdesc_accessDrmCertificates">Allows an application to provision and use DRM certficates. Should never be needed for normal apps.</string> + <!-- Policy administration --> <!-- Title of policy access to limiting the user's password choices --> |