From a0dda9ca9d69fdeff620c7986375589e2a4d8c42 Mon Sep 17 00:00:00 2001 From: Przemyslaw Szczepaniak Date: Fri, 22 Jan 2016 11:16:29 +0000 Subject: [PATCH] Fix incorrect @hide usage in libcore @hide annotation is only effective in Javadoc. Bug: 26689841 Change-Id: Ifc0a1358b64518a40b4334061ef8ca0dd23ea28e --- api/current.txt | 20 -------------------- api/system-current.txt | 20 -------------------- api/test-current.txt | 20 -------------------- 3 files changed, 60 deletions(-) diff --git a/api/current.txt b/api/current.txt index 4d4be4b264059..9de0af6376a0c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -47921,10 +47921,8 @@ package java.io { } 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 @@ package java.io { 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 @@ package java.lang { 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 @@ package java.net { 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 @@ package java.net { 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 @@ package java.net { 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 @@ package java.net { method public boolean hasExpired(); method public boolean isHttpOnly(); method public static java.util.List parse(java.lang.String); - method public static java.util.List 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 @@ package java.net { } 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 @@ package java.net { 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 @@ package java.net { 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 @@ package java.net { 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 @@ package java.net { 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 @@ package java.util.jar { 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 bba7075dd0e43..2b34895667060 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -50675,10 +50675,8 @@ package java.io { } 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(); @@ -50962,7 +50960,6 @@ package java.io { 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; } @@ -51633,7 +51630,6 @@ package java.lang { 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; @@ -53785,7 +53781,6 @@ package java.net { 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 { @@ -53803,7 +53798,6 @@ package java.net { 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 { @@ -53883,7 +53877,6 @@ package java.net { 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(); @@ -53960,7 +53953,6 @@ package java.net { method public boolean hasExpired(); method public boolean isHttpOnly(); method public static java.util.List parse(java.lang.String); - method public static java.util.List parse(java.lang.String, boolean); method public void setComment(java.lang.String); method public void setCommentURL(java.lang.String); method public void setDiscard(boolean); @@ -54053,9 +54045,6 @@ package java.net { } 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 { @@ -54064,8 +54053,6 @@ package java.net { 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 { @@ -54193,13 +54180,11 @@ package java.net { 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 { @@ -54334,8 +54319,6 @@ package java.net { 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 { @@ -54405,8 +54388,6 @@ package java.net { 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 { @@ -62351,7 +62332,6 @@ package java.util.jar { 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 5db61f6334752..e39efca55ab66 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -47937,10 +47937,8 @@ package java.io { } 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 @@ package java.io { 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 @@ package java.lang { 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 @@ package java.net { 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 @@ package java.net { 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 @@ package java.net { 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 @@ package java.net { method public boolean hasExpired(); method public boolean isHttpOnly(); method public static java.util.List parse(java.lang.String); - method public static java.util.List 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 @@ package java.net { } 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 @@ package java.net { 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 @@ package java.net { 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 @@ package java.net { 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 @@ package java.net { 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 @@ package java.util.jar { 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"; }