diff options
| author | Ido Ofir <iofir@google.com> | 2014-06-04 10:52:44 -0700 |
|---|---|---|
| committer | Ido Ofir <iofir@google.com> | 2014-06-13 14:52:19 -0700 |
| commit | 29372ab484c916c0774c976d5b896a7cf19a2b91 (patch) | |
| tree | 3628bf3cb20b60ffd3dc9a7cdd0bfc02875faab5 /core | |
| parent | 677d4ae6eae38a110ed7d73cf6982c042d80c499 (diff) | |
| download | frameworks_base-29372ab484c916c0774c976d5b896a7cf19a2b91.zip frameworks_base-29372ab484c916c0774c976d5b896a7cf19a2b91.tar.gz frameworks_base-29372ab484c916c0774c976d5b896a7cf19a2b91.tar.bz2 | |
Adding permission for launching the trust agent settings.
Change-Id: Iac5bde57ca8d465fdf0fa5848d6716fc88801aeb
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/AndroidManifest.xml | 7 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index b628b7c..edca101 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2663,6 +2663,13 @@ android:label="@string/permlab_provide_trust_agent" android:description="@string/permdesc_provide_trust_agent" /> + <!-- Allows an application to launch the trust agent settings activity. + @hide --> + <permission android:name="android.permission.LAUNCH_TRUST_AGENT_SETTINGS" + android:protectionLevel="signatureOrSystem" + android:label="@string/permlab_launch_trust_agent_settings" + android:description="@string/permdesc_launch_trust_agent_settings" /> + <!-- Must be required by an {@link android.service.trust.TrustAgentService}, to ensure that only the system can bind to it. --> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 0ddfeb6..6e1b5ef 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -3795,6 +3795,8 @@ <string name="permlab_provide_trust_agent">Provide a trust agent.</string> <!-- Description of an application permission that lets it provide a trust agent. --> <string name="permdesc_provide_trust_agent">Allows an application to provide a trust agent.</string> + <string name="permlab_launch_trust_agent_settings">Lunch trust agent settings menu.</string> + <string name="permdesc_launch_trust_agent_settings">Allows an application to lunch an activity that changes the trust agent behavior.</string> <!-- Title of an application permission that lets it bind to a trust agent service. --> <string name="permlab_bind_trust_agent_service">Bind to a trust agent service</string> |