diff options
| author | Jeff Tinker <jtinker@google.com> | 2014-04-03 01:30:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-03 01:30:42 +0000 |
| commit | 4995d72520d16302fca13bc4614d1dd3c0d1c17c (patch) | |
| tree | 20d707437aea84763eb3f01972906bf76dfa4215 /core | |
| parent | 31518f745ffa5e832274c332ac957a065948fdaf (diff) | |
| parent | 65c94e695929ffa1aaa49d7b5938b34aaf078b6c (diff) | |
| download | frameworks_base-4995d72520d16302fca13bc4614d1dd3c0d1c17c.zip frameworks_base-4995d72520d16302fca13bc4614d1dd3c0d1c17c.tar.gz frameworks_base-4995d72520d16302fca13bc4614d1dd3c0d1c17c.tar.bz2 | |
Merge "Add signature|system permission to MediaDrm signer APIs" into klp-modular-dev
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 --> |