diff options
| author | Paul Duffin <paulduffin@google.com> | 2018-11-22 14:46:33 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2018-11-22 14:47:10 +0000 |
| commit | c996128840e69abb363f5b41f677550718db9892 (patch) | |
| tree | 3786236a709b301631213e7644397b0b63bd52ee | |
| parent | 3d7da52deef7cc3f5e167a832a9c15c2a533a866 (diff) | |
| download | bouncycastle-c996128840e69abb363f5b41f677550718db9892.tar.gz | |
Add missing default constructors
Metalava was accidentally including default constructors in the API
generated for CorePlatformApi and IntraCoreApi annotations. This change
adds the constructor and appropriate annotations to allow the metalava
bug to be fixed without changing the API.
Tested by building the API with and without the Metalava fix and
checking that they were the same.
Bug: 119859108
Test: see above
Change-Id: Ibb537c88aaa0db2867cfef590c86bb414a98ee69
| -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 |