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

Commit 31952c36 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Keystore 2.0 SPI: Fix installation of legacy Keystore provider" am: 54082686 am: 3a1c6e6b am: 2d6247e3

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

Change-Id: I144782a0ccbdfb7b78ce63db9eec8a71e058de9f
parents 5ba5c09b 2d6247e3

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

+1 −2
Original line number Diff line number Diff line
@@ -83,8 +83,7 @@ public class AndroidKeyStoreProvider extends Provider { 
        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");