summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sergio Giro <sgiro@google.com> 2016-09-07 12:41:13 +0000
committer android-build-merger <android-build-merger@google.com> 2016-09-07 12:41:13 +0000
commitcd7448e1970aede11d96b1de3dae187f50061794 (patch)
tree69143298aefc93d3e5bd742bc021f6f13d4a954b
parentf391157087465c181e8993a39faa8240ffbdc0d6 (diff)
parente043ec79179c65ffb4c0ff07ef342c6c0c3cb993 (diff)
Merge "java.security.SecureRandom: add getInstanceStrong() method" am: 4c2df18a4d am: 09a2121d5d am: fcc05f0f66
am: e043ec7917 Change-Id: Ia31a59deed24fd7de2c10bf99b467eb1d3433c9d
-rw-r--r--api/current.txt1
-rw-r--r--api/system-current.txt1
-rw-r--r--api/test-current.txt1
3 files changed, 3 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index d85f705817af..d70db53cb8f7 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -55514,6 +55514,7 @@ package java.security {
method public static java.security.SecureRandom getInstance(java.lang.String) throws java.security.NoSuchAlgorithmException;
method public static java.security.SecureRandom getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
method public static java.security.SecureRandom getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException;
+ method public static java.security.SecureRandom getInstanceStrong() throws java.security.NoSuchAlgorithmException;
method public final java.security.Provider getProvider();
method public static byte[] getSeed(int);
method protected final int next(int);
diff --git a/api/system-current.txt b/api/system-current.txt
index d10c5cb46c21..ec60b7b92e55 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -59042,6 +59042,7 @@ package java.security {
method public static java.security.SecureRandom getInstance(java.lang.String) throws java.security.NoSuchAlgorithmException;
method public static java.security.SecureRandom getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
method public static java.security.SecureRandom getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException;
+ method public static java.security.SecureRandom getInstanceStrong() throws java.security.NoSuchAlgorithmException;
method public final java.security.Provider getProvider();
method public static byte[] getSeed(int);
method protected final int next(int);
diff --git a/api/test-current.txt b/api/test-current.txt
index 336f2564c586..4a4b72742202 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -55605,6 +55605,7 @@ package java.security {
method public static java.security.SecureRandom getInstance(java.lang.String) throws java.security.NoSuchAlgorithmException;
method public static java.security.SecureRandom getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException;
method public static java.security.SecureRandom getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException;
+ method public static java.security.SecureRandom getInstanceStrong() throws java.security.NoSuchAlgorithmException;
method public final java.security.Provider getProvider();
method public static byte[] getSeed(int);
method protected final int next(int);