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

2018-03-24 03:59:27 +00:00
parent ea97f89048 4b4a0539b6
commit 799c3a62f7
1 changed files with 1 additions and 0 deletions
--- a/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java
+++ b/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java
@@ -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  {