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

Merge "Use keymasterSwEnforcedUserAuthenticators if keymasterHwEnforcedUserAuthenticators is zero." am: 3b2decbb34

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705645

Change-Id: Iadbd63a4c99d148179b41be32a3862a2fcdd617c
This commit is contained in:
Joshua Duong
2021-05-13 20:29:47 +00:00
committed by Automerger Merge Worker
parent c881ac71b5 3b2decbb34
commit bc9360ea4e
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,