summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jim Miller <jaggies@google.com> 2015-07-14 16:51:51 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-07-14 16:51:51 +0000
commitf07602bea9f964d03a009445ffe3a6172fa33432 (patch)
treea0ea2d00787a5f93416e60d1ca64dd9bdac972fd
parent40d8c2be35a21c132de821b4f08a0e4483488684 (diff)
parentc1aaa6ae49d6c1820472a2061ec8f6df08ffea50 (diff)
am c1aaa6ae: am 5ab70110: am a9845680: am a95d9f0b: am 16c1764c: Merge "Change MANAGE_FINGERPRINT permission to system|signature" into mnc-dev
* commit 'c1aaa6ae49d6c1820472a2061ec8f6df08ffea50': Change MANAGE_FINGERPRINT permission to system|signature
-rw-r--r--core/res/AndroidManifest.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 9f4ea64010b9..99e2c0189d73 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -2446,7 +2446,7 @@
<!-- Allows managing (adding, removing) fingerprint templates. Reserved for the system. @hide -->
<permission android:name="android.permission.MANAGE_FINGERPRINT"
- android:protectionLevel="signature" />
+ android:protectionLevel="system|signature" />
<!-- Allows an application to control keyguard. Only allowed for system processes.
@hide -->