summaryrefslogtreecommitdiffstats
path: root/core/res/AndroidManifest.xml
diff options
context:
space:
mode:
authorIdo Ofir <iofir@google.com>2014-06-04 10:52:44 -0700
committerIdo Ofir <iofir@google.com>2014-06-13 14:52:19 -0700
commit29372ab484c916c0774c976d5b896a7cf19a2b91 (patch)
tree3628bf3cb20b60ffd3dc9a7cdd0bfc02875faab5 /core/res/AndroidManifest.xml
parent677d4ae6eae38a110ed7d73cf6982c042d80c499 (diff)
downloadframeworks_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/res/AndroidManifest.xml')
-rw-r--r--core/res/AndroidManifest.xml7
1 files changed, 7 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. -->