Re-generate the signature file with up-to-date metalava
Merged-in is from a random AM change from rvc-dev-plus-aosp
Test: Build
Exempt-From-Owner-Approval: Back-porting (not exact cherry-pic) from master
Change-Id: I9c8f0c8e6ffdc9c101b9262bf6033a93393f5401
Merged-in: I03d3f911c2e458610f108b19f5e32fc5e95293a1
diff --git a/mmodules/intracoreapi/api/intra/current-api.txt b/mmodules/intracoreapi/api/intra/current-api.txt
index 5137a10..f98906f 100644
--- a/mmodules/intracoreapi/api/intra/current-api.txt
+++ b/mmodules/intracoreapi/api/intra/current-api.txt
@@ -58,7 +58,7 @@
package java.net {
public class Socket implements java.io.Closeable {
- method public java.io.FileDescriptor getFileDescriptor$();
+ method @libcore.api.IntraCoreApi public java.io.FileDescriptor getFileDescriptor$();
}
}
@@ -70,11 +70,11 @@
}
public abstract class CharsetDecoder {
- ctor protected CharsetDecoder(java.nio.charset.Charset, float, float);
+ ctor @libcore.api.IntraCoreApi protected CharsetDecoder(java.nio.charset.Charset, float, float);
}
public abstract class CharsetEncoder {
- ctor protected CharsetEncoder(java.nio.charset.Charset, float, float, byte[], boolean);
+ ctor @libcore.api.IntraCoreApi protected CharsetEncoder(java.nio.charset.Charset, float, float, byte[], boolean);
}
}
@@ -82,8 +82,8 @@
package java.security.spec {
public class ECParameterSpec implements java.security.spec.AlgorithmParameterSpec {
- method public String getCurveName();
- method public void setCurveName(String);
+ method @libcore.api.IntraCoreApi public String getCurveName();
+ method @libcore.api.IntraCoreApi public void setCurveName(String);
}
}
@@ -133,18 +133,18 @@
package sun.security.util {
- public interface DerEncoder {
- method public void derEncode(java.io.OutputStream) throws java.io.IOException;
+ @libcore.api.IntraCoreApi public interface DerEncoder {
+ method @libcore.api.IntraCoreApi public void derEncode(java.io.OutputStream) throws java.io.IOException;
}
}
package sun.security.x509 {
- public class AlgorithmId implements sun.security.util.DerEncoder java.io.Serializable {
- method public void derEncode(java.io.OutputStream) throws java.io.IOException;
- method public static sun.security.x509.AlgorithmId get(String) throws java.security.NoSuchAlgorithmException;
- method public String getName();
+ @libcore.api.IntraCoreApi public class AlgorithmId implements sun.security.util.DerEncoder java.io.Serializable {
+ method @libcore.api.IntraCoreApi public void derEncode(java.io.OutputStream) throws java.io.IOException;
+ method @libcore.api.IntraCoreApi public static sun.security.x509.AlgorithmId get(String) throws java.security.NoSuchAlgorithmException;
+ method @libcore.api.IntraCoreApi public String getName();
}
}
