Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b2decbb authored by Joshua Duong's avatar Joshua Duong Committed by Gerrit Code Review
Browse files

Merge "Use keymasterSwEnforcedUserAuthenticators if keymasterHwEnforcedUserAuthenticators is zero."

parents 0529640c 299345bb

keystore/java/android/security/keystore2/AndroidKeyStoreSecretKeyFactorySpi.java

+3 −1
Original line number Diff line number Diff line
@@ -252,7 +252,9 @@ public class AndroidKeyStoreSecretKeyFactorySpi extends SecretKeyFactorySpi { 
                blockModes,

                userAuthenticationRequired,

                (int) userAuthenticationValidityDurationSeconds,

                keymasterHwEnforcedUserAuthenticators,

                userAuthenticationRequirementEnforcedBySecureHardware

                        ? keymasterHwEnforcedUserAuthenticators

                        : keymasterSwEnforcedUserAuthenticators,

                userAuthenticationRequirementEnforcedBySecureHardware,

                userAuthenticationValidWhileOnBody,

                trustedUserPresenceRequired,