diff options
| author | Joshua Duong <joshuaduong@google.com> | 2021-05-13 20:16:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-05-13 20:16:08 +0000 |
| commit | 3b2decbb34e30736a9d6fa9d8d43a37a1db165d0 (patch) | |
| tree | c9b09e690095dbb076396c3bd4152047edcd6d57 /keystore/java/android | |
| parent | 0529640cc07544e9e3fd1ee40f86939501e934fa (diff) | |
| parent | 299345bb8e64e432bfa481ac09f7e21a426b9005 (diff) | |
Merge "Use keymasterSwEnforcedUserAuthenticators if keymasterHwEnforcedUserAuthenticators is zero."
Diffstat (limited to 'keystore/java/android')
| -rw-r--r-- | keystore/java/android/security/keystore2/AndroidKeyStoreSecretKeyFactorySpi.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreSecretKeyFactorySpi.java b/keystore/java/android/security/keystore2/AndroidKeyStoreSecretKeyFactorySpi.java index fe05989c3846..97592b44ba2e 100644 --- a/keystore/java/android/security/keystore2/AndroidKeyStoreSecretKeyFactorySpi.java +++ b/keystore/java/android/security/keystore2/AndroidKeyStoreSecretKeyFactorySpi.java @@ -252,7 +252,9 @@ public class AndroidKeyStoreSecretKeyFactorySpi extends SecretKeyFactorySpi { blockModes, userAuthenticationRequired, (int) userAuthenticationValidityDurationSeconds, - keymasterHwEnforcedUserAuthenticators, + userAuthenticationRequirementEnforcedBySecureHardware + ? keymasterHwEnforcedUserAuthenticators + : keymasterSwEnforcedUserAuthenticators, userAuthenticationRequirementEnforcedBySecureHardware, userAuthenticationValidWhileOnBody, trustedUserPresenceRequired, |