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

Commit 266c2c91 authored by Dmitry Dementyev's avatar Dmitry Dementyev Committed by android-build-merger
Browse files

Merge "Add missing @NonNull annotation to AndroidKeyStoreProvider method." into pi-dev 

am: 799c3a62

Change-Id: I532fae36d2cbb096ad0976cd6c619a5fddcee131
parents fdb48b6e 799c3a62

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

+1 −0
Original line number Diff line number Diff line
@@ -339,6 +339,7 @@ public class AndroidKeyStoreProvider extends Provider { 
        return new AndroidKeyStoreSecretKey(secretKeyAlias, uid, keyAlgorithmString);

    }



    @NonNull

    public static AndroidKeyStoreKey loadAndroidKeyStoreKeyFromKeystore(

            @NonNull KeyStore keyStore, @NonNull String userKeyAlias, int uid)

            throws UnrecoverableKeyException  {