commit 51c1b3466acfb77c14ee5332ff1ff2a273af4670
author Sergio Giro <sgiro@google.com> Wed Sep 07 12:44:28 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 07 12:44:28 2016 +0000
tree 5ff07af18e4a22b8f441d5374b0d0bce7bee36b1
parent e76fc7ca5a1de021ef70d89761260b886ba18741
parent ff14a693b967cbeb0279b2260d55ea94bdb734bc

Merge "java.security.cert.X509CRL: add new method verify(PublicKey, Provider)" am: 12d3d4bbba am: 6c753ca336 am: c0f7d4c65b
am: ff14a693b9

Change-Id: I240cbc0a38f4b90a93678a2a41428228936b733e

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 7b29626..4c8e61a 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -56141,6 +56141,7 @@
     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 {

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index a4d169c..f2049a92 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -59669,6 +59669,7 @@
     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 {

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index 062a9e8..a4753e4 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -56232,6 +56232,7 @@
     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 {