diff options
| author | Paul Duffin <paulduffin@google.com> | 2018-11-23 02:35:52 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-11-23 02:35:52 -0800 |
| commit | db328bc41b8d82cd1c66d75f36a45d2b30a76d81 (patch) | |
| tree | 4a3c140f9275b97f9c14114b7c430a8cb57ffc67 | |
| parent | fbe0e31908986139c7050fd69dcebf203e1da880 (diff) | |
| parent | c625f99da2b2d6145b1476fcc4d1f9ee91130812 (diff) | |
| download | bouncycastle-db328bc41b8d82cd1c66d75f36a45d2b30a76d81.tar.gz | |
Merge "Add missing default constructors" am: 718d6a1c5c am: 03087da574
am: c625f99da2
Change-Id: I95e3c3b71216b8c01c5b80c487b8a5ceceea2267
| -rw-r--r-- | android_bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1Object.java | 4 | ||||
| -rw-r--r-- | srcgen/core-platform-api.txt | 1 | ||||
| -rw-r--r-- | srcgen/default-constructors.txt | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/android_bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1Object.java b/android_bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1Object.java index 446b7da2..c8afd018 100644 --- a/android_bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1Object.java +++ b/android_bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1Object.java @@ -14,6 +14,10 @@ import com.android.org.bouncycastle.util.Encodable; public abstract class ASN1Object implements ASN1Encodable, Encodable { + @libcore.api.CorePlatformApi + public ASN1Object() { + } + /** * Return the default BER or DER encoding for this object. * diff --git a/srcgen/core-platform-api.txt b/srcgen/core-platform-api.txt index cd3a540d..92025ea0 100644 --- a/srcgen/core-platform-api.txt +++ b/srcgen/core-platform-api.txt @@ -16,6 +16,7 @@ method:com.android.org.bouncycastle.asn1.ASN1InputStream#ASN1InputStream(InputSt method:com.android.org.bouncycastle.asn1.ASN1InputStream#readObject() method:com.android.org.bouncycastle.asn1.ASN1Integer#ASN1Integer(BigInteger) method:com.android.org.bouncycastle.asn1.ASN1Null#hashCode() +method:com.android.org.bouncycastle.asn1.ASN1Object#ASN1Object() method:com.android.org.bouncycastle.asn1.ASN1Object#getEncoded() method:com.android.org.bouncycastle.asn1.ASN1Object#getEncoded(String) method:com.android.org.bouncycastle.asn1.ASN1ObjectIdentifier#ASN1ObjectIdentifier(String) diff --git a/srcgen/default-constructors.txt b/srcgen/default-constructors.txt new file mode 100644 index 00000000..47487681 --- /dev/null +++ b/srcgen/default-constructors.txt @@ -0,0 +1 @@ +com.android.org.bouncycastle.asn1.ASN1Object |