Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use keymasterSwEnforcedUserAuthenticators if keymasterHwEnforcedUserAuthenticators is zero."

Browse Source
This commit is contained in:
Joshua Duong
2021-05-13 20:16:08 +00:00
committed by Gerrit Code Review
parent 0529640cc0 299345bb8e
commit 3b2decbb34
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
keystore/java/android/security/keystore2/AndroidKeyStoreSecretKeyFactorySpi.java
View File

@@ -252,7 +252,9 @@ public class AndroidKeyStoreSecretKeyFactorySpi extends SecretKeyFactorySpi {
blockModes, blockModes,
userAuthenticationRequired, userAuthenticationRequired,
(int) userAuthenticationValidityDurationSeconds, (int) userAuthenticationValidityDurationSeconds,
keymasterHwEnforcedUserAuthenticators, userAuthenticationRequirementEnforcedBySecureHardware
? keymasterHwEnforcedUserAuthenticators
: keymasterSwEnforcedUserAuthenticators,
userAuthenticationRequirementEnforcedBySecureHardware, userAuthenticationRequirementEnforcedBySecureHardware,
userAuthenticationValidWhileOnBody, userAuthenticationValidWhileOnBody,
trustedUserPresenceRequired, trustedUserPresenceRequired,