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

Commit 0c4f8f2f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Keystore SPI: Fix typos." am: 881b75d3 am: b0421a53 am: c1892e83 am: 48225d08 

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

Change-Id: I1eab0c9491547010eed8c4e20298551eb0c46933
parents f2010e35 48225d08

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

+2 −2
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ public class AndroidKeyStoreSecretKeyFactorySpi extends SecretKeyFactorySpi { 
                && (keymasterSwEnforcedUserAuthenticators == 0);

        boolean userAuthenticationValidWhileOnBody =

                keyCharacteristics.hwEnforced.getBoolean(KeymasterDefs.KM_TAG_ALLOW_WHILE_ON_BODY);

        boolean trustedUserPresenceRequred =

        boolean trustedUserPresenceRequired =

                keyCharacteristics.hwEnforced.getBoolean(

                    KeymasterDefs.KM_TAG_TRUSTED_USER_PRESENCE_REQUIRED);
@@ -209,7 +209,7 @@ public class AndroidKeyStoreSecretKeyFactorySpi extends SecretKeyFactorySpi { 
                keymasterHwEnforcedUserAuthenticators,

                userAuthenticationRequirementEnforcedBySecureHardware,

                userAuthenticationValidWhileOnBody,

                trustedUserPresenceRequred,

                trustedUserPresenceRequired,

                invalidatedByBiometricEnrollment,

                userConfirmationRequired);

    }

keystore/java/android/security/keystore/KeyStoreCryptoOperationUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ abstract class KeyStoreCryptoOperationUtils { 
            return null;

        }



        // An error occured. However, some errors should not lead to init throwing an exception.

        // An error occurred. However, some errors should not lead to init throwing an exception.

        // See below.

        InvalidKeyException e =

                keyStore.getInvalidKeyException(key.getAlias(), key.getUid(), beginOpResultCode);