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

Commit 502a2187 authored by Joshua Duong's avatar Joshua Duong Committed by Automerger Merge Worker
Browse files

Merge "Use keymasterSwEnforcedUserAuthenticators if... 

Merge "Use keymasterSwEnforcedUserAuthenticators if keymasterHwEnforcedUserAuthenticators is zero." am: 3b2decbb am: bc9360ea am: 791f0884 am: d10df933

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

Change-Id: Ic95e22628de278803e50040228635d2c2c33fe50
parents 2b388666 d10df933

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,