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 am: bc9360ea4e

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

Change-Id: I835c98cbed1be7f90d0c57b25d16cf0bda36b3b1
This commit is contained in:
Joshua Duong
2021-05-13 20:39:50 +00:00
committed by Automerger Merge Worker
parent 9853e8a94e bc9360ea4e
commit 791f088436
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,