commit 540826860636597c634fc8c991d22b97d893bdbc
author Treehugger Robot <treehugger-gerrit@google.com> Fri Nov 27 00:44:59 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 27 00:44:59 2020 +0000
tree cd70b22fafc8d1360721396ee4bbc896fa09df22
parent a421f8ff5334a1aeecbd2fd0686cb1e216fc9285
parent 9fb5607114355c625aa61893badc9acd9e6440ae

Merge "Keystore 2.0 SPI: Fix installation of legacy Keystore provider"

keystore/java/android/security/keystore/AndroidKeyStoreProvider.java

diff --git a/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java b/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java
index 5867ef6..b1b6306 100644
--- a/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java
+++ b/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java
@@ -83,8 +83,7 @@
         boolean supports3DES = "true".equals(android.os.SystemProperties.get(DESEDE_SYSTEM_PROPERTY));
 
         // java.security.KeyStore
-        put("KeyStore.AndroidKeyStore", PACKAGE_NAME + ".AndroidKeyStoreSpi");
-        put("Alg.Alias.KeyStore.AndroidKeyStoreLegacy", "AndroidKeyStore");
+        put("KeyStore." + providerName, PACKAGE_NAME + ".AndroidKeyStoreSpi");
 
         // java.security.KeyPairGenerator
         put("KeyPairGenerator.EC", PACKAGE_NAME + ".AndroidKeyStoreKeyPairGeneratorSpi$EC");