diff options
| author | Neil Fuller <nfuller@google.com> | 2018-10-15 09:10:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-15 09:10:40 +0000 |
| commit | eaa882d87cadb812c1437e24e2ce7bb32ed182c8 (patch) | |
| tree | 39236a50e250de4f02a1c5d37a078e0f10a347e0 | |
| parent | a74c87c3a3481aa51c01b71494fb9d6acc4ed6e7 (diff) | |
| parent | 3513bab81e8d4462204b0936e185248a014d23ce (diff) | |
Merge "Avoid constructor with non-API class"
| -rw-r--r-- | mmodules/core_platform_api/Android.bp | 6 | ||||
| -rw-r--r-- | ojluni/annotations/mmodule/sun/security/pkcs/SignerInfo.annotated.java | 3 | ||||
| -rw-r--r-- | ojluni/src/main/java/sun/security/pkcs/SignerInfo.java | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/mmodules/core_platform_api/Android.bp b/mmodules/core_platform_api/Android.bp index d07f980a38..cef142c810 100644 --- a/mmodules/core_platform_api/Android.bp +++ b/mmodules/core_platform_api/Android.bp @@ -53,11 +53,7 @@ java_library { hostdex: true, no_standard_libs: true, - libs: ["core-all"], - system_modules: "core-all-system-modules", - openjdk9: { - javacflags: ["--patch-module=java.base=."], - }, + system_modules: "none", } // Used when compiling higher-level code against core.platform.api.stubs. diff --git a/ojluni/annotations/mmodule/sun/security/pkcs/SignerInfo.annotated.java b/ojluni/annotations/mmodule/sun/security/pkcs/SignerInfo.annotated.java index 9ddd02a302..b929e2e956 100644 --- a/ojluni/annotations/mmodule/sun/security/pkcs/SignerInfo.annotated.java +++ b/ojluni/annotations/mmodule/sun/security/pkcs/SignerInfo.annotated.java @@ -35,6 +35,9 @@ import java.io.IOException; @SuppressWarnings({"unchecked", "deprecation", "all"}) public class SignerInfo implements sun.security.util.DerEncoder { +@libcore.api.CorePlatformApi +public SignerInfo() { throw new RuntimeException("Stub!"); } + public SignerInfo(sun.security.x509.X500Name issuerName, java.math.BigInteger serial, sun.security.x509.AlgorithmId digestAlgorithmId, sun.security.x509.AlgorithmId digestEncryptionAlgorithmId, byte[] encryptedDigest) { throw new RuntimeException("Stub!"); } public SignerInfo(sun.security.x509.X500Name issuerName, java.math.BigInteger serial, sun.security.x509.AlgorithmId digestAlgorithmId, sun.security.pkcs.PKCS9Attributes authenticatedAttributes, sun.security.x509.AlgorithmId digestEncryptionAlgorithmId, byte[] encryptedDigest, sun.security.pkcs.PKCS9Attributes unauthenticatedAttributes) { throw new RuntimeException("Stub!"); } diff --git a/ojluni/src/main/java/sun/security/pkcs/SignerInfo.java b/ojluni/src/main/java/sun/security/pkcs/SignerInfo.java index 305373055c..88fcf06761 100644 --- a/ojluni/src/main/java/sun/security/pkcs/SignerInfo.java +++ b/ojluni/src/main/java/sun/security/pkcs/SignerInfo.java @@ -96,6 +96,9 @@ public class SignerInfo implements DerEncoder { PKCS9Attributes authenticatedAttributes; PKCS9Attributes unauthenticatedAttributes; + // Android-added: No-arg constructor to use in @libcore.api.CorePlatformApi + public SignerInfo() {} + public SignerInfo(X500Name issuerName, BigInteger serial, AlgorithmId digestAlgorithmId, |