diff options
| author | Jim Miller <jaggies@google.com> | 2015-08-18 23:18:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-18 23:18:36 +0000 |
| commit | 7ef772713fac5d7b69874f2b972cdec7a60f074b (patch) | |
| tree | d50e3669c2ebd2f42898b30f15fae1c279ced538 /core/res/AndroidManifest.xml | |
| parent | 2591d6ffc60505df0099069877f7913ec30e4460 (diff) | |
| parent | bea9d7b94cfa16da8f257ed705e218b017d459a7 (diff) | |
| download | frameworks_base-7ef772713fac5d7b69874f2b972cdec7a60f074b.zip frameworks_base-7ef772713fac5d7b69874f2b972cdec7a60f074b.tar.gz frameworks_base-7ef772713fac5d7b69874f2b972cdec7a60f074b.tar.bz2 | |
am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev
* commit 'bea9d7b94cfa16da8f257ed705e218b017d459a7':
Reset fingerprint lockout timer when strong auth is used.
Diffstat (limited to 'core/res/AndroidManifest.xml')
| -rw-r--r-- | core/res/AndroidManifest.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index ec98aba..03bc9c6 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2472,6 +2472,10 @@ <permission android:name="android.permission.MANAGE_FINGERPRINT" android:protectionLevel="system|signature" /> + <!-- Allows an app to reset fingerprint attempt counter. Reserved for the system. @hide --> + <permission android:name="android.permission.RESET_FINGERPRINT_LOCKOUT" + android:protectionLevel="signature" /> + <!-- Allows an application to control keyguard. Only allowed for system processes. @hide --> <permission android:name="android.permission.CONTROL_KEYGUARD" |