Fix incorrect @hide usage in libcore
@hide annotation is only effective in Javadoc.
Bug: 26689841
Change-Id: I6e924b7452423b25d7258bb174e5b1601302c907
(cherry picked from commit a0dda9ca9d69fdeff620c7986375589e2a4d8c42)
diff --git a/api/current.txt b/api/current.txt
index 927b588..11ee243 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -46733,10 +46733,8 @@
}
public final class Console implements java.io.Flushable {
- method public static java.io.Console console();
method public void flush();
method public java.io.Console format(java.lang.String, java.lang.Object...);
- method public static synchronized java.io.Console getConsole();
method public java.io.Console printf(java.lang.String, java.lang.Object...);
method public java.lang.String readLine(java.lang.String, java.lang.Object...);
method public java.lang.String readLine();
@@ -47020,7 +47018,6 @@
public class InterruptedIOException extends java.io.IOException {
ctor public InterruptedIOException();
ctor public InterruptedIOException(java.lang.String);
- ctor public InterruptedIOException(java.lang.Throwable);
field public int bytesTransferred;
}
@@ -47691,7 +47688,6 @@
method public long longValue();
method public static byte parseByte(java.lang.String, int) throws java.lang.NumberFormatException;
method public static byte parseByte(java.lang.String) throws java.lang.NumberFormatException;
- method public static java.lang.String toHexString(byte, boolean);
method public static java.lang.String toString(byte);
method public static java.lang.Byte valueOf(byte);
method public static java.lang.Byte valueOf(java.lang.String, int) throws java.lang.NumberFormatException;
@@ -49843,7 +49839,6 @@
public class BindException extends java.net.SocketException {
ctor public BindException(java.lang.String);
ctor public BindException();
- ctor public BindException(java.lang.String, java.lang.Throwable);
}
public abstract class CacheRequest {
@@ -49861,7 +49856,6 @@
public class ConnectException extends java.net.SocketException {
ctor public ConnectException(java.lang.String);
ctor public ConnectException();
- ctor public ConnectException(java.lang.String, java.lang.Throwable);
}
public abstract class ContentHandler {
@@ -49941,7 +49935,6 @@
method public void disconnect();
method public synchronized boolean getBroadcast() throws java.net.SocketException;
method public java.nio.channels.DatagramChannel getChannel();
- method public final java.io.FileDescriptor getFileDescriptor$();
method public java.net.InetAddress getInetAddress();
method public java.net.InetAddress getLocalAddress();
method public int getLocalPort();
@@ -50018,7 +50011,6 @@
method public boolean hasExpired();
method public boolean isHttpOnly();
method public static java.util.List<java.net.HttpCookie> parse(java.lang.String);
- method public static java.util.List<java.net.HttpCookie> parse(java.lang.String, boolean);
method public void setComment(java.lang.String);
method public void setCommentURL(java.lang.String);
method public void setDiscard(boolean);
@@ -50111,9 +50103,6 @@
}
public final class Inet4Address extends java.net.InetAddress {
- field public static final java.net.InetAddress ALL;
- field public static final java.net.InetAddress ANY;
- field public static final java.net.InetAddress LOOPBACK;
}
public final class Inet6Address extends java.net.InetAddress {
@@ -50122,8 +50111,6 @@
method public int getScopeId();
method public java.net.NetworkInterface getScopedInterface();
method public boolean isIPv4CompatibleAddress();
- field public static final java.net.InetAddress ANY;
- field public static final java.net.InetAddress LOOPBACK;
}
public class InetAddress implements java.io.Serializable {
@@ -50251,13 +50238,11 @@
public class PortUnreachableException extends java.net.SocketException {
ctor public PortUnreachableException(java.lang.String);
ctor public PortUnreachableException();
- ctor public PortUnreachableException(java.lang.String, java.lang.Throwable);
}
public class ProtocolException extends java.io.IOException {
ctor public ProtocolException(java.lang.String);
ctor public ProtocolException();
- ctor public ProtocolException(java.lang.String, java.lang.Throwable);
}
public abstract interface ProtocolFamily {
@@ -50392,8 +50377,6 @@
public class SocketException extends java.io.IOException {
ctor public SocketException(java.lang.String);
ctor public SocketException();
- ctor public SocketException(java.lang.Throwable);
- ctor public SocketException(java.lang.String, java.lang.Throwable);
}
public abstract class SocketImpl implements java.net.SocketOptions {
@@ -50463,8 +50446,6 @@
public class SocketTimeoutException extends java.io.InterruptedIOException {
ctor public SocketTimeoutException(java.lang.String);
ctor public SocketTimeoutException();
- ctor public SocketTimeoutException(java.lang.Throwable);
- ctor public SocketTimeoutException(java.lang.String, java.lang.Throwable);
}
public final class StandardProtocolFamily extends java.lang.Enum implements java.net.ProtocolFamily {
@@ -58409,7 +58390,6 @@
ctor public JarFile(java.io.File, boolean, int) throws java.io.IOException;
method public java.util.jar.JarEntry getJarEntry(java.lang.String);
method public java.util.jar.Manifest getManifest() throws java.io.IOException;
- method public boolean hasClassPathAttribute() throws java.io.IOException;
field public static final java.lang.String MANIFEST_NAME = "META-INF/MANIFEST.MF";
}
diff --git a/api/system-current.txt b/api/system-current.txt
index 9ff969f..0d292a2 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -49351,10 +49351,8 @@
}
public final class Console implements java.io.Flushable {
- method public static java.io.Console console();
method public void flush();
method public java.io.Console format(java.lang.String, java.lang.Object...);
- method public static synchronized java.io.Console getConsole();
method public java.io.Console printf(java.lang.String, java.lang.Object...);
method public java.lang.String readLine(java.lang.String, java.lang.Object...);
method public java.lang.String readLine();
@@ -49638,7 +49636,6 @@
public class InterruptedIOException extends java.io.IOException {
ctor public InterruptedIOException();
ctor public InterruptedIOException(java.lang.String);
- ctor public InterruptedIOException(java.lang.Throwable);
field public int bytesTransferred;
}
@@ -50309,7 +50306,6 @@
method public long longValue();
method public static byte parseByte(java.lang.String, int) throws java.lang.NumberFormatException;
method public static byte parseByte(java.lang.String) throws java.lang.NumberFormatException;
- method public static java.lang.String toHexString(byte, boolean);
method public static java.lang.String toString(byte);
method public static java.lang.Byte valueOf(byte);
method public static java.lang.Byte valueOf(java.lang.String, int) throws java.lang.NumberFormatException;
@@ -52461,7 +52457,6 @@
public class BindException extends java.net.SocketException {
ctor public BindException(java.lang.String);
ctor public BindException();
- ctor public BindException(java.lang.String, java.lang.Throwable);
}
public abstract class CacheRequest {
@@ -52479,7 +52474,6 @@
public class ConnectException extends java.net.SocketException {
ctor public ConnectException(java.lang.String);
ctor public ConnectException();
- ctor public ConnectException(java.lang.String, java.lang.Throwable);
}
public abstract class ContentHandler {
@@ -52559,7 +52553,6 @@
method public void disconnect();
method public synchronized boolean getBroadcast() throws java.net.SocketException;
method public java.nio.channels.DatagramChannel getChannel();
- method public final java.io.FileDescriptor getFileDescriptor$();
method public java.net.InetAddress getInetAddress();
method public java.net.InetAddress getLocalAddress();
method public int getLocalPort();
@@ -52636,7 +52629,6 @@
method public boolean hasExpired();
method public boolean isHttpOnly();
method public static java.util.List<java.net.HttpCookie> parse(java.lang.String);
- method public static java.util.List<java.net.HttpCookie> parse(java.lang.String, boolean);
method public void setComment(java.lang.String);
method public void setCommentURL(java.lang.String);
method public void setDiscard(boolean);
@@ -52729,9 +52721,6 @@
}
public final class Inet4Address extends java.net.InetAddress {
- field public static final java.net.InetAddress ALL;
- field public static final java.net.InetAddress ANY;
- field public static final java.net.InetAddress LOOPBACK;
}
public final class Inet6Address extends java.net.InetAddress {
@@ -52740,8 +52729,6 @@
method public int getScopeId();
method public java.net.NetworkInterface getScopedInterface();
method public boolean isIPv4CompatibleAddress();
- field public static final java.net.InetAddress ANY;
- field public static final java.net.InetAddress LOOPBACK;
}
public class InetAddress implements java.io.Serializable {
@@ -52869,13 +52856,11 @@
public class PortUnreachableException extends java.net.SocketException {
ctor public PortUnreachableException(java.lang.String);
ctor public PortUnreachableException();
- ctor public PortUnreachableException(java.lang.String, java.lang.Throwable);
}
public class ProtocolException extends java.io.IOException {
ctor public ProtocolException(java.lang.String);
ctor public ProtocolException();
- ctor public ProtocolException(java.lang.String, java.lang.Throwable);
}
public abstract interface ProtocolFamily {
@@ -53010,8 +52995,6 @@
public class SocketException extends java.io.IOException {
ctor public SocketException(java.lang.String);
ctor public SocketException();
- ctor public SocketException(java.lang.Throwable);
- ctor public SocketException(java.lang.String, java.lang.Throwable);
}
public abstract class SocketImpl implements java.net.SocketOptions {
@@ -53081,8 +53064,6 @@
public class SocketTimeoutException extends java.io.InterruptedIOException {
ctor public SocketTimeoutException(java.lang.String);
ctor public SocketTimeoutException();
- ctor public SocketTimeoutException(java.lang.Throwable);
- ctor public SocketTimeoutException(java.lang.String, java.lang.Throwable);
}
public final class StandardProtocolFamily extends java.lang.Enum implements java.net.ProtocolFamily {
@@ -61027,7 +61008,6 @@
ctor public JarFile(java.io.File, boolean, int) throws java.io.IOException;
method public java.util.jar.JarEntry getJarEntry(java.lang.String);
method public java.util.jar.Manifest getManifest() throws java.io.IOException;
- method public boolean hasClassPathAttribute() throws java.io.IOException;
field public static final java.lang.String MANIFEST_NAME = "META-INF/MANIFEST.MF";
}
