Merge "Add more bouncycastle to the @CorePlatformApi"
diff --git a/android_bcprov/src/main/java/com/android/org/bouncycastle/jce/provider/BouncyCastleProvider.java b/android_bcprov/src/main/java/com/android/org/bouncycastle/jce/provider/BouncyCastleProvider.java
index ae83cc6..78e548e 100644
--- a/android_bcprov/src/main/java/com/android/org/bouncycastle/jce/provider/BouncyCastleProvider.java
+++ b/android_bcprov/src/main/java/com/android/org/bouncycastle/jce/provider/BouncyCastleProvider.java
@@ -44,6 +44,7 @@
* test for getInstance works.
* @hide This class is not part of the Android public SDK API
*/
+@libcore.api.CorePlatformApi
public final class BouncyCastleProvider extends Provider
implements ConfigurableProvider
{
@@ -140,6 +141,7 @@
* using runtime registration of the provider using the
* <code>Security.addProvider()</code> mechanism.
*/
+ @libcore.api.CorePlatformApi
public BouncyCastleProvider()
{
super(PROVIDER_NAME, 1.57, info);
diff --git a/srcgen/core-platform-api.txt b/srcgen/core-platform-api.txt
index cdc9049..909f922 100644
--- a/srcgen/core-platform-api.txt
+++ b/srcgen/core-platform-api.txt
@@ -43,6 +43,7 @@
method:com.android.org.bouncycastle.asn1.x509.X509Name#getInstance(Object)
method:com.android.org.bouncycastle.asn1.x509.X509Name#toString(boolean,Hashtable)
method:com.android.org.bouncycastle.jce.X509Principal#X509Principal(byte[])
+method:com.android.org.bouncycastle.jce.provider.BouncyCastleProvider#BouncyCastleProvider()
method:com.android.org.bouncycastle.util.io.pem.PemObject#getContent()
method:com.android.org.bouncycastle.util.io.pem.PemObject#getType()
method:com.android.org.bouncycastle.util.io.pem.PemObject#PemObject(String,byte[])
@@ -82,6 +83,7 @@
type:com.android.org.bouncycastle.asn1.x509.V3TBSCertificateGenerator
type:com.android.org.bouncycastle.asn1.x509.X509Name
type:com.android.org.bouncycastle.asn1.x9.X9ObjectIdentifiers
+type:com.android.org.bouncycastle.jce.provider.BouncyCastleProvider
type:com.android.org.bouncycastle.jce.provider.X509CertificateObject
type:com.android.org.bouncycastle.jce.X509Principal
type:com.android.org.bouncycastle.util.io.pem.PemObject