diff options
| author | Jeff Tinker <jtinker@google.com> | 2014-04-04 00:30:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-04 00:30:28 +0000 |
| commit | 8d0c89ad16193e98c7a96f13d8f03a05e75a0f4a (patch) | |
| tree | 4aac669d5768f0caa3c1e6eb4b2ebbc5d7dbd555 /core | |
| parent | ed3db02c051f52f9ad3770e3c6b5b90c71a04fb1 (diff) | |
| parent | 9de8c1d82b6bf2b70e854a3349c9f1da60a23e83 (diff) | |
| download | frameworks_base-8d0c89ad16193e98c7a96f13d8f03a05e75a0f4a.zip frameworks_base-8d0c89ad16193e98c7a96f13d8f03a05e75a0f4a.tar.gz frameworks_base-8d0c89ad16193e98c7a96f13d8f03a05e75a0f4a.tar.bz2 | |
Merge "resolved conflicts for merge of 4f342e87 to master"
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 2a4d872..3857cd1 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2585,6 +2585,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 3a4f059..902aea8 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -2002,6 +2002,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_setInputCalibration">Allows the app to modify the calibration parameters of the touch screen. 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 --> |