commit 7e03dfcb796ef1a6000a5fd5fda03c9e15ea62e1
author Adrian Roos <roosa@google.com> Fri May 16 16:06:28 2014 +0200
committer Adrian Roos <roosa@google.com> Fri May 16 16:06:28 2014 +0200
tree 2058b03d3495ac0ecab4869d798c4838d0ab63be
parent b0650e8ff3113f9b9dbb6d249339dbd7921b4517

Apply revised TrustAgent API

Bug: 14997466
Change-Id: I81042e058a20f28603a11471882f3dcfc4f8b13c

core/res/AndroidManifest.xml

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index cdb77f1..4eac802 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -2613,7 +2613,7 @@
     <!-- Must be required by an {@link
          android.service.trust.TrustAgentService},
          to ensure that only the system can bind to it. -->
-    <permission android:name="android.permission.BIND_TRUST_AGENT_SERVICE"
+    <permission android:name="android.permission.BIND_TRUST_AGENT"
                 android:protectionLevel="signature"
                 android:label="@string/permlab_bind_trust_agent_service"
                 android:description="@string/permdesc_bind_trust_agent_service" />