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 am: 791f088436 am: d10df9336a

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

Change-Id: Ic95e22628de278803e50040228635d2c2c33fe50
This commit is contained in:
Joshua Duong
2021-05-13 21:06:47 +00:00
committed by Automerger Merge Worker
parent 2b3886667f d10df9336a
commit 502a218709
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,
userAuthenticationRequired,
(int) userAuthenticationValidityDurationSeconds,
keymasterHwEnforcedUserAuthenticators,
userAuthenticationRequirementEnforcedBySecureHardware
? keymasterHwEnforcedUserAuthenticators
: keymasterSwEnforcedUserAuthenticators,
userAuthenticationRequirementEnforcedBySecureHardware,
userAuthenticationValidWhileOnBody,
trustedUserPresenceRequired,