| commit | cfccabd9e9b12db285d01c49313be63982bb3d2a | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <[email protected]> | Sat Sep 16 22:15:23 2023 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Sat Sep 16 22:15:23 2023 +0000 |
| tree | 8a5b329343f31c7210487013ae454454f5e29443 | |
| parent | 1ced4266ef1b7037069c5f7ba37198b98c9a79ec [diff] | |
| parent | 56092cea7af0e3f94a11b22a54a693e147d876a7 [diff] |
Merge "Fix error message formatting" into main am: 15a2601cc9 am: 56092cea7a Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2753145 Change-Id: Ia74ac90b6f4fb44e1a56dbbef6e5bf25966117d9 Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreECDSASignatureSpi.java b/keystore/java/android/security/keystore2/AndroidKeyStoreECDSASignatureSpi.java index ace2053..9d3fca8 100644 --- a/keystore/java/android/security/keystore2/AndroidKeyStoreECDSASignatureSpi.java +++ b/keystore/java/android/security/keystore2/AndroidKeyStoreECDSASignatureSpi.java
@@ -195,7 +195,7 @@ protected final void initKey(AndroidKeyStoreKey key) throws InvalidKeyException { if (!ACCEPTED_SIGNING_SCHEMES.contains(key.getAlgorithm().toLowerCase())) { throw new InvalidKeyException("Unsupported key algorithm: " + key.getAlgorithm() - + ". Only" + Arrays.toString(ACCEPTED_SIGNING_SCHEMES.stream().toArray()) + + ". Only " + Arrays.toString(ACCEPTED_SIGNING_SCHEMES.stream().toArray()) + " supported"); }
diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreRSASignatureSpi.java b/keystore/java/android/security/keystore2/AndroidKeyStoreRSASignatureSpi.java index 931c2f8..d5fb49a 100644 --- a/keystore/java/android/security/keystore2/AndroidKeyStoreRSASignatureSpi.java +++ b/keystore/java/android/security/keystore2/AndroidKeyStoreRSASignatureSpi.java
@@ -189,7 +189,7 @@ protected final void initKey(AndroidKeyStoreKey key) throws InvalidKeyException { if (!KeyProperties.KEY_ALGORITHM_RSA.equalsIgnoreCase(key.getAlgorithm())) { throw new InvalidKeyException("Unsupported key algorithm: " + key.getAlgorithm() - + ". Only" + KeyProperties.KEY_ALGORITHM_RSA + " supported"); + + ". Only " + KeyProperties.KEY_ALGORITHM_RSA + " supported"); } super.initKey(key); }