diff options
author | Jorim Jaggi <jjaggi@google.com> | 2015-09-10 00:05:38 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-10 00:05:38 +0000 |
commit | 131d541ae1ca41aacf751f6a6562f4f031a4ab35 (patch) | |
tree | 40b7368b801143849de7d51e1b322afc3379999c /core/java/com | |
parent | 12fdaf8589813065d2e8b9873196471ed38c7b80 (diff) | |
parent | 16093fe3f0d824731a53a264a132504deb08421a (diff) | |
download | frameworks_base-131d541ae1ca41aacf751f6a6562f4f031a4ab35.zip frameworks_base-131d541ae1ca41aacf751f6a6562f4f031a4ab35.tar.gz frameworks_base-131d541ae1ca41aacf751f6a6562f4f031a4ab35.tar.bz2 |
am 16093fe3: Revert "Disable fingerprint after force lock"
* commit '16093fe3f0d824731a53a264a132504deb08421a':
Revert "Disable fingerprint after force lock"
Diffstat (limited to 'core/java/com')
-rw-r--r-- | core/java/com/android/internal/widget/LockPatternUtils.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java index 4ac2958..a873ef8 100644 --- a/core/java/com/android/internal/widget/LockPatternUtils.java +++ b/core/java/com/android/internal/widget/LockPatternUtils.java @@ -1174,7 +1174,7 @@ public class LockPatternUtils { * @param userId either an explicit user id or {@link android.os.UserHandle#USER_ALL} */ public void requireCredentialEntry(int userId) { - requireStrongAuth(StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_REQUEST, userId); + requireStrongAuth(StrongAuthTracker.SOME_AUTH_REQUIRED_AFTER_USER_REQUEST, userId); } /** @@ -1251,7 +1251,7 @@ public class LockPatternUtils { value = { STRONG_AUTH_NOT_REQUIRED, STRONG_AUTH_REQUIRED_AFTER_BOOT, STRONG_AUTH_REQUIRED_AFTER_DPM_LOCK_NOW, - STRONG_AUTH_REQUIRED_AFTER_USER_REQUEST}) + SOME_AUTH_REQUIRED_AFTER_USER_REQUEST}) @Retention(RetentionPolicy.SOURCE) public @interface StrongAuthFlags {} @@ -1266,14 +1266,14 @@ public class LockPatternUtils { public static final int STRONG_AUTH_REQUIRED_AFTER_BOOT = 0x1; /** - * Strong authentication is required because a device admin has temporarily requested it. + * Strong authentication is required because a device admin has requested it. */ public static final int STRONG_AUTH_REQUIRED_AFTER_DPM_LOCK_NOW = 0x2; /** - * Strong authentication is required because the user has temporarily requested it. + * Some authentication is required because the user has temporarily disabled trust. */ - public static final int STRONG_AUTH_REQUIRED_AFTER_USER_REQUEST = 0x4; + public static final int SOME_AUTH_REQUIRED_AFTER_USER_REQUEST = 0x4; /** * Strong authentication is required because the user has been locked out after too many @@ -1289,6 +1289,7 @@ public class LockPatternUtils { public static final int DEFAULT = STRONG_AUTH_REQUIRED_AFTER_BOOT; private static final int ALLOWING_FINGERPRINT = STRONG_AUTH_NOT_REQUIRED + | SOME_AUTH_REQUIRED_AFTER_USER_REQUEST | SOME_AUTH_REQUIRED_AFTER_WRONG_CREDENTIAL; private final SparseIntArray mStrongAuthRequiredForUser = new SparseIntArray(); |