Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Keystore SPI: Fix typos." am: 881b75d3ed am: b0421a53b2

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

Change-Id: I4f925b1b601b3c9b11d162bd08cf1066a0db21e6
This commit is contained in:
Treehugger Robot
2020-10-23 20:23:51 +00:00
committed by Automerger Merge Worker
parent 1fd0a64a11 b0421a53b2
commit c1892e8344
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
keystore/java/android/security/keystore/AndroidKeyStoreSecretKeyFactorySpi.java
View File

@@ -177,7 +177,7 @@ public class AndroidKeyStoreSecretKeyFactorySpi extends SecretKeyFactorySpi {
&& (keymasterSwEnforcedUserAuthenticators == 0); && (keymasterSwEnforcedUserAuthenticators == 0);
boolean userAuthenticationValidWhileOnBody = boolean userAuthenticationValidWhileOnBody =
keyCharacteristics.hwEnforced.getBoolean(KeymasterDefs.KM_TAG_ALLOW_WHILE_ON_BODY); keyCharacteristics.hwEnforced.getBoolean(KeymasterDefs.KM_TAG_ALLOW_WHILE_ON_BODY);
boolean trustedUserPresenceRequred = boolean trustedUserPresenceRequired =
keyCharacteristics.hwEnforced.getBoolean( keyCharacteristics.hwEnforced.getBoolean(
KeymasterDefs.KM_TAG_TRUSTED_USER_PRESENCE_REQUIRED); KeymasterDefs.KM_TAG_TRUSTED_USER_PRESENCE_REQUIRED);
@@ -209,7 +209,7 @@ public class AndroidKeyStoreSecretKeyFactorySpi extends SecretKeyFactorySpi {
keymasterHwEnforcedUserAuthenticators, keymasterHwEnforcedUserAuthenticators,
userAuthenticationRequirementEnforcedBySecureHardware, userAuthenticationRequirementEnforcedBySecureHardware,
userAuthenticationValidWhileOnBody, userAuthenticationValidWhileOnBody,
trustedUserPresenceRequred, trustedUserPresenceRequired,
invalidatedByBiometricEnrollment, invalidatedByBiometricEnrollment,
userConfirmationRequired); userConfirmationRequired);
} }

2
keystore/java/android/security/keystore/KeyStoreCryptoOperationUtils.java
View File

@@ -48,7 +48,7 @@ abstract class KeyStoreCryptoOperationUtils {
return null; 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. // See below.
InvalidKeyException e = InvalidKeyException e =
keyStore.getInvalidKeyException(key.getAlias(), key.getUid(), beginOpResultCode); keyStore.getInvalidKeyException(key.getAlias(), key.getUid(), beginOpResultCode);