Merge "Generate and check the api.txt file for intra core api"
diff --git a/mmodules/core_platform_api/api/platform/current-api.txt b/mmodules/core_platform_api/api/platform/current-api.txt
index dfb3c70..92f9bad 100644
--- a/mmodules/core_platform_api/api/platform/current-api.txt
+++ b/mmodules/core_platform_api/api/platform/current-api.txt
@@ -1,3 +1,42 @@
+package com.android.okhttp.internalandroidapi {
+
+ public final class AndroidResponseCacheAdapter {
+ ctor public AndroidResponseCacheAdapter(com.android.okhttp.internalandroidapi.HasCacheHolder.CacheHolder);
+ method public void close() throws java.io.IOException;
+ method public void delete() throws java.io.IOException;
+ method public void flush() throws java.io.IOException;
+ method public java.net.CacheResponse get(java.net.URI, java.lang.String, java.util.Map<java.lang.String, java.util.List<java.lang.String>>) throws java.io.IOException;
+ method public com.android.okhttp.internalandroidapi.HasCacheHolder.CacheHolder getCacheHolder();
+ method public int getHitCount();
+ method public long getMaxSize();
+ method public int getNetworkCount();
+ method public int getRequestCount();
+ method public long getSize() throws java.io.IOException;
+ method public java.net.CacheRequest put(java.net.URI, java.net.URLConnection) throws java.io.IOException;
+ }
+
+ public abstract interface Dns {
+ method public abstract java.util.List<java.net.InetAddress> lookup(java.lang.String) throws java.net.UnknownHostException;
+ }
+
+ public abstract interface HasCacheHolder {
+ method public abstract com.android.okhttp.internalandroidapi.HasCacheHolder.CacheHolder getCacheHolder();
+ }
+
+ public static final class HasCacheHolder.CacheHolder {
+ method public static com.android.okhttp.internalandroidapi.HasCacheHolder.CacheHolder create(java.io.File, long);
+ method public boolean isEquivalent(java.io.File, long);
+ }
+
+ public final class HttpURLConnectionFactory {
+ ctor public HttpURLConnectionFactory();
+ method public java.net.URLConnection openConnection(java.net.URL, javax.net.SocketFactory, java.net.Proxy) throws java.io.IOException;
+ method public void setDns(com.android.okhttp.internalandroidapi.Dns);
+ method public void setNewConnectionPool(int, long, java.util.concurrent.TimeUnit);
+ }
+
+}
+
package com.android.org.bouncycastle.asn1 {
public abstract class ASN1BitString extends com.android.org.bouncycastle.asn1.ASN1Primitive {
diff --git a/mmodules/core_platform_api/api/platform/last-api.txt b/mmodules/core_platform_api/api/platform/last-api.txt
index 1a9d8bf..92f9bad 100644
--- a/mmodules/core_platform_api/api/platform/last-api.txt
+++ b/mmodules/core_platform_api/api/platform/last-api.txt
@@ -1,3 +1,224 @@
+package com.android.okhttp.internalandroidapi {
+
+ public final class AndroidResponseCacheAdapter {
+ ctor public AndroidResponseCacheAdapter(com.android.okhttp.internalandroidapi.HasCacheHolder.CacheHolder);
+ method public void close() throws java.io.IOException;
+ method public void delete() throws java.io.IOException;
+ method public void flush() throws java.io.IOException;
+ method public java.net.CacheResponse get(java.net.URI, java.lang.String, java.util.Map<java.lang.String, java.util.List<java.lang.String>>) throws java.io.IOException;
+ method public com.android.okhttp.internalandroidapi.HasCacheHolder.CacheHolder getCacheHolder();
+ method public int getHitCount();
+ method public long getMaxSize();
+ method public int getNetworkCount();
+ method public int getRequestCount();
+ method public long getSize() throws java.io.IOException;
+ method public java.net.CacheRequest put(java.net.URI, java.net.URLConnection) throws java.io.IOException;
+ }
+
+ public abstract interface Dns {
+ method public abstract java.util.List<java.net.InetAddress> lookup(java.lang.String) throws java.net.UnknownHostException;
+ }
+
+ public abstract interface HasCacheHolder {
+ method public abstract com.android.okhttp.internalandroidapi.HasCacheHolder.CacheHolder getCacheHolder();
+ }
+
+ public static final class HasCacheHolder.CacheHolder {
+ method public static com.android.okhttp.internalandroidapi.HasCacheHolder.CacheHolder create(java.io.File, long);
+ method public boolean isEquivalent(java.io.File, long);
+ }
+
+ public final class HttpURLConnectionFactory {
+ ctor public HttpURLConnectionFactory();
+ method public java.net.URLConnection openConnection(java.net.URL, javax.net.SocketFactory, java.net.Proxy) throws java.io.IOException;
+ method public void setDns(com.android.okhttp.internalandroidapi.Dns);
+ method public void setNewConnectionPool(int, long, java.util.concurrent.TimeUnit);
+ }
+
+}
+
+package com.android.org.bouncycastle.asn1 {
+
+ public abstract class ASN1BitString extends com.android.org.bouncycastle.asn1.ASN1Primitive {
+ }
+
+ public abstract interface ASN1Encodable {
+ }
+
+ public class ASN1EncodableVector {
+ ctor public ASN1EncodableVector();
+ method public void add(com.android.org.bouncycastle.asn1.ASN1Encodable);
+ }
+
+ public class ASN1InputStream extends java.io.FilterInputStream {
+ ctor public ASN1InputStream(byte[]);
+ method public com.android.org.bouncycastle.asn1.ASN1Primitive readObject() throws java.io.IOException;
+ }
+
+ public class ASN1Integer extends com.android.org.bouncycastle.asn1.ASN1Primitive {
+ ctor public ASN1Integer(java.math.BigInteger);
+ }
+
+ public abstract class ASN1Null extends com.android.org.bouncycastle.asn1.ASN1Primitive {
+ }
+
+ public abstract class ASN1Object implements com.android.org.bouncycastle.asn1.ASN1Encodable {
+ ctor public ASN1Object();
+ method public byte[] getEncoded() throws java.io.IOException;
+ }
+
+ public class ASN1ObjectIdentifier extends com.android.org.bouncycastle.asn1.ASN1Primitive {
+ }
+
+ public abstract class ASN1Primitive extends com.android.org.bouncycastle.asn1.ASN1Object {
+ }
+
+ public abstract class ASN1Sequence extends com.android.org.bouncycastle.asn1.ASN1Primitive implements com.android.org.bouncycastle.util.Iterable {
+ }
+
+ public class DERBitString extends com.android.org.bouncycastle.asn1.ASN1BitString {
+ ctor public DERBitString(byte[]);
+ }
+
+ public deprecated class DERInteger extends com.android.org.bouncycastle.asn1.ASN1Integer {
+ ctor public DERInteger(long);
+ }
+
+ public class DERNull extends com.android.org.bouncycastle.asn1.ASN1Null {
+ field public static final com.android.org.bouncycastle.asn1.DERNull INSTANCE;
+ }
+
+ public class DERSequence extends com.android.org.bouncycastle.asn1.ASN1Sequence {
+ ctor public DERSequence();
+ ctor public DERSequence(com.android.org.bouncycastle.asn1.ASN1EncodableVector);
+ }
+
+}
+
+package com.android.org.bouncycastle.asn1.pkcs {
+
+ public abstract interface PKCSObjectIdentifiers {
+ field public static final com.android.org.bouncycastle.asn1.ASN1ObjectIdentifier sha256WithRSAEncryption;
+ }
+
+}
+
+package com.android.org.bouncycastle.asn1.x509 {
+
+ public class AlgorithmIdentifier extends com.android.org.bouncycastle.asn1.ASN1Object {
+ ctor public AlgorithmIdentifier(com.android.org.bouncycastle.asn1.ASN1ObjectIdentifier);
+ ctor public AlgorithmIdentifier(com.android.org.bouncycastle.asn1.ASN1ObjectIdentifier, com.android.org.bouncycastle.asn1.ASN1Encodable);
+ }
+
+ public class Certificate extends com.android.org.bouncycastle.asn1.ASN1Object {
+ method public static com.android.org.bouncycastle.asn1.x509.Certificate getInstance(java.lang.Object);
+ }
+
+ public class SubjectPublicKeyInfo extends com.android.org.bouncycastle.asn1.ASN1Object {
+ method public static com.android.org.bouncycastle.asn1.x509.SubjectPublicKeyInfo getInstance(java.lang.Object);
+ }
+
+ public class TBSCertificate extends com.android.org.bouncycastle.asn1.ASN1Object {
+ }
+
+ public class Time extends com.android.org.bouncycastle.asn1.ASN1Object {
+ ctor public Time(java.util.Date);
+ }
+
+ public class V3TBSCertificateGenerator {
+ ctor public V3TBSCertificateGenerator();
+ method public com.android.org.bouncycastle.asn1.x509.TBSCertificate generateTBSCertificate();
+ method public void setEndDate(com.android.org.bouncycastle.asn1.x509.Time);
+ method public deprecated void setIssuer(com.android.org.bouncycastle.asn1.x509.X509Name);
+ method public void setSerialNumber(com.android.org.bouncycastle.asn1.ASN1Integer);
+ method public void setSignature(com.android.org.bouncycastle.asn1.x509.AlgorithmIdentifier);
+ method public void setStartDate(com.android.org.bouncycastle.asn1.x509.Time);
+ method public deprecated void setSubject(com.android.org.bouncycastle.asn1.x509.X509Name);
+ method public void setSubjectPublicKeyInfo(com.android.org.bouncycastle.asn1.x509.SubjectPublicKeyInfo);
+ }
+
+ public deprecated class X509Name extends com.android.org.bouncycastle.asn1.ASN1Object {
+ ctor public deprecated X509Name(java.lang.String);
+ method public java.util.Vector getOIDs();
+ method public java.util.Vector getValues();
+ field public static final deprecated com.android.org.bouncycastle.asn1.ASN1ObjectIdentifier CN;
+ field public static final deprecated com.android.org.bouncycastle.asn1.ASN1ObjectIdentifier O;
+ field public static final deprecated com.android.org.bouncycastle.asn1.ASN1ObjectIdentifier OU;
+ }
+
+}
+
+package com.android.org.bouncycastle.asn1.x9 {
+
+ public abstract interface X9ObjectIdentifiers {
+ field public static final com.android.org.bouncycastle.asn1.ASN1ObjectIdentifier ecdsa_with_SHA256;
+ }
+
+}
+
+package com.android.org.bouncycastle.jce {
+
+ public deprecated class X509Principal extends com.android.org.bouncycastle.asn1.x509.X509Name implements java.security.Principal {
+ ctor public X509Principal(byte[]) throws java.io.IOException;
+ method public byte[] getEncoded();
+ }
+
+}
+
+package com.android.org.bouncycastle.jce.provider {
+
+ public deprecated class X509CertificateObject extends java.security.cert.X509Certificate {
+ ctor public X509CertificateObject(com.android.org.bouncycastle.asn1.x509.Certificate) throws java.security.cert.CertificateParsingException;
+ }
+
+}
+
+package com.android.org.bouncycastle.util {
+
+ public abstract interface Iterable<T> implements java.lang.Iterable {
+ }
+
+}
+
+package com.android.org.bouncycastle.util.io.pem {
+
+ public class PemObject implements com.android.org.bouncycastle.util.io.pem.PemObjectGenerator {
+ ctor public PemObject(java.lang.String, byte[]);
+ method public byte[] getContent();
+ method public java.lang.String getType();
+ }
+
+ public abstract interface PemObjectGenerator {
+ }
+
+ public class PemReader extends java.io.BufferedReader {
+ ctor public PemReader(java.io.Reader);
+ method public com.android.org.bouncycastle.util.io.pem.PemObject readPemObject() throws java.io.IOException;
+ }
+
+ public class PemWriter extends java.io.BufferedWriter {
+ ctor public PemWriter(java.io.Writer);
+ method public void writeObject(com.android.org.bouncycastle.util.io.pem.PemObjectGenerator) throws java.io.IOException;
+ }
+
+}
+
+package com.android.org.bouncycastle.x509 {
+
+ public deprecated class X509V3CertificateGenerator {
+ ctor public X509V3CertificateGenerator();
+ method public java.security.cert.X509Certificate generate(java.security.PrivateKey) throws java.security.cert.CertificateEncodingException, java.lang.IllegalStateException, java.security.InvalidKeyException, java.security.NoSuchAlgorithmException, java.security.SignatureException;
+ method public void setIssuerDN(javax.security.auth.x500.X500Principal);
+ method public void setNotAfter(java.util.Date);
+ method public void setNotBefore(java.util.Date);
+ method public void setPublicKey(java.security.PublicKey) throws java.lang.IllegalArgumentException;
+ method public void setSerialNumber(java.math.BigInteger);
+ method public void setSignatureAlgorithm(java.lang.String);
+ method public void setSubjectDN(javax.security.auth.x500.X500Principal);
+ }
+
+}
+
package libcore.mmodule.libart {
public class DemoLibartClass {