Merge "Fix incorrect @hide usage in libcore"
diff --git a/api/current.txt b/api/current.txt
index 4d4be4b..9de0af6 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -47921,10 +47921,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();
@@ -48208,7 +48206,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;
}
@@ -48879,7 +48876,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;
@@ -51031,7 +51027,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 {
@@ -51049,7 +51044,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 {
@@ -51129,7 +51123,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();
@@ -51206,7 +51199,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);
@@ -51299,9 +51291,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 {
@@ -51310,8 +51299,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 {
@@ -51439,13 +51426,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 {
@@ -51580,8 +51565,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 {
@@ -51651,8 +51634,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 {
@@ -59597,7 +59578,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 fec4a99..e723d099 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -50677,10 +50677,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();
@@ -50964,7 +50962,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;
}
@@ -51635,7 +51632,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;
@@ -53787,7 +53783,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 {
@@ -53805,7 +53800,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 {
@@ -53885,7 +53879,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();
@@ -53962,7 +53955,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);
@@ -54055,9 +54047,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 {
@@ -54066,8 +54055,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 {
@@ -54195,13 +54182,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 {
@@ -54336,8 +54321,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 {
@@ -54407,8 +54390,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 {
@@ -62353,7 +62334,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/test-current.txt b/api/test-current.txt
index 5db61f6..e39efca 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -47937,10 +47937,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();
@@ -48224,7 +48222,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;
}
@@ -48895,7 +48892,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;
@@ -51047,7 +51043,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 {
@@ -51065,7 +51060,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 {
@@ -51145,7 +51139,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();
@@ -51222,7 +51215,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);
@@ -51315,9 +51307,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 {
@@ -51326,8 +51315,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 {
@@ -51455,13 +51442,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 {
@@ -51596,8 +51581,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 {
@@ -51667,8 +51650,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 {
@@ -59613,7 +59594,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";
}