summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sergio Giro <sgiro@google.com> 2016-09-07 12:44:28 +0000
committer android-build-merger <android-build-merger@google.com> 2016-09-07 12:44:28 +0000
commit51c1b3466acfb77c14ee5332ff1ff2a273af4670 (patch)
tree5ff07af18e4a22b8f441d5374b0d0bce7bee36b1
parente76fc7ca5a1de021ef70d89761260b886ba18741 (diff)
parentff14a693b967cbeb0279b2260d55ea94bdb734bc (diff)
Merge "java.security.cert.X509CRL: add new method verify(PublicKey, Provider)" am: 12d3d4bbba am: 6c753ca336 am: c0f7d4c65b
am: ff14a693b9 Change-Id: I240cbc0a38f4b90a93678a2a41428228936b733e
-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 7b296263b0d3..4c8e61abd6e7 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -56141,6 +56141,7 @@ package java.security.cert {
method public abstract int getVersion();
method public abstract void verify(java.security.PublicKey) throws java.security.cert.CRLException, java.security.InvalidKeyException, java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException, java.security.SignatureException;
method public abstract void verify(java.security.PublicKey, java.lang.String) throws java.security.cert.CRLException, java.security.InvalidKeyException, java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException, java.security.SignatureException;
+ method public void verify(java.security.PublicKey, java.security.Provider) throws java.security.cert.CRLException, java.security.InvalidKeyException, java.security.NoSuchAlgorithmException, java.security.SignatureException;
}
public abstract class X509CRLEntry implements java.security.cert.X509Extension {
diff --git a/api/system-current.txt b/api/system-current.txt
index a4d169cee208..f2049a92cf06 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -59669,6 +59669,7 @@ package java.security.cert {
method public abstract int getVersion();
method public abstract void verify(java.security.PublicKey) throws java.security.cert.CRLException, java.security.InvalidKeyException, java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException, java.security.SignatureException;
method public abstract void verify(java.security.PublicKey, java.lang.String) throws java.security.cert.CRLException, java.security.InvalidKeyException, java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException, java.security.SignatureException;
+ method public void verify(java.security.PublicKey, java.security.Provider) throws java.security.cert.CRLException, java.security.InvalidKeyException, java.security.NoSuchAlgorithmException, java.security.SignatureException;
}
public abstract class X509CRLEntry implements java.security.cert.X509Extension {
diff --git a/api/test-current.txt b/api/test-current.txt
index 062a9e81051b..a4753e4d48e7 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -56232,6 +56232,7 @@ package java.security.cert {
method public abstract int getVersion();
method public abstract void verify(java.security.PublicKey) throws java.security.cert.CRLException, java.security.InvalidKeyException, java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException, java.security.SignatureException;
method public abstract void verify(java.security.PublicKey, java.lang.String) throws java.security.cert.CRLException, java.security.InvalidKeyException, java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException, java.security.SignatureException;
+ method public void verify(java.security.PublicKey, java.security.Provider) throws java.security.cert.CRLException, java.security.InvalidKeyException, java.security.NoSuchAlgorithmException, java.security.SignatureException;
}
public abstract class X509CRLEntry implements java.security.cert.X509Extension {