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

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

Merge "Fix Broken test:... 

Merge "Fix Broken test: libcore.java.security.ProviderTest#test_Provider_Properties" am: c778d8e7 am: 796b8b36 am: ee01197b am: b6b0dee0

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

Change-Id: I5607d564f17134d746431a7e0f024844030a5753
parents 69c5cfed b6b0dee0

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

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ public class AndroidKeyStoreProvider extends Provider { 


        // java.security.KeyStore

        put("KeyStore.AndroidKeyStore", PACKAGE_NAME + ".AndroidKeyStoreSpi");

        put("alg.alias.KeyStore.AndroidKeyStoreLegacy", "AndroidKeyStore");

        put("Alg.Alias.KeyStore.AndroidKeyStoreLegacy", "AndroidKeyStore");



        // java.security.KeyPairGenerator

        put("KeyPairGenerator.EC", PACKAGE_NAME + ".AndroidKeyStoreKeyPairGeneratorSpi$EC");