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

Commit 1b701701 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fixing default timeout constant" into rvc-dev am: 7697d0f3 

Change-Id: I8d05ab8eda6bfc7a93013dcc8a85b31d26c8515a
parents b1809e1c 7697d0f3

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

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ public class AndroidKeyStoreSecretKeyFactorySpi extends SecretKeyFactorySpi { 
        boolean userAuthenticationRequired =

                !keyCharacteristics.getBoolean(KeymasterDefs.KM_TAG_NO_AUTH_REQUIRED);

        long userAuthenticationValidityDurationSeconds =

                keyCharacteristics.getUnsignedInt(KeymasterDefs.KM_TAG_AUTH_TIMEOUT, -1);

                keyCharacteristics.getUnsignedInt(KeymasterDefs.KM_TAG_AUTH_TIMEOUT, 0);

        if (userAuthenticationValidityDurationSeconds > Integer.MAX_VALUE) {

            throw new ProviderException("User authentication timeout validity too long: "

                    + userAuthenticationValidityDurationSeconds + " seconds");