Remove @hide from Java 6 API.

I've left the two new spi packages @hidden, because I think we shouldn't
support them without convincing demand from developers (and I don't
believe there could be such a thing --- they just don't make sense, and
if we add anything, it should be the ability to provide extra ICU data).

Also fix a handful of javadoc syntax errors in Arrays.java and TreeMap.java.

Bug: 2497395
Change-Id: I4176b72daff0face4ed6c7ee1d1f4267d52006b4

40 files changed, 4 insertions, 137 deletions

diff --git a/luni/src/main/java/java/io/Console.java b/luni/src/main/java/java/io/Console.java
index 1da92f0..bd6be75 100644
--- a/luni/src/main/java/java/io/Console.java
+++ b/luni/src/main/java/java/io/Console.java
@@ -24,7 +24,6 @@ import java.util.Formatter;
  * Provides access to the console, if available. The system-wide instance can
  * be accessed via {@link java.lang.System.console}.
  * @since 1.6
- * @hide
  */
 public final class Console implements Flushable {
     private static final Object CONSOLE_LOCK = new Object();
diff --git a/luni/src/main/java/java/io/File.java b/luni/src/main/java/java/io/File.java
index f47e0a4..4d1e637 100644
--- a/luni/src/main/java/java/io/File.java
+++ b/luni/src/main/java/java/io/File.java
@@ -314,7 +314,6 @@ public class File implements Serializable, Comparable<File> {
      * @see java.lang.SecurityManager#checkExec(String)
      *
      * @since 1.6
-     * @hide
      */
     public boolean canExecute() {
         if (path.isEmpty()) {
@@ -941,7 +940,6 @@ public class File implements Serializable, Comparable<File> {
      *             SecurityManager.checkWrite(java.lang.String) disallows write
      *             permission to this file object
      * @since 1.6
-     * @hide
      */
     public boolean setExecutable(boolean executable, boolean ownerOnly) {
         if (path.isEmpty()) {
@@ -958,7 +956,6 @@ public class File implements Serializable, Comparable<File> {
      * Equivalent to setExecutable(executable, true).
      * @see #setExecutable(boolean, boolean)
      * @since 1.6
-     * @hide
      */
     public boolean setExecutable(boolean executable) {
         return setExecutable(executable, true);
@@ -987,7 +984,6 @@ public class File implements Serializable, Comparable<File> {
      *             SecurityManager.checkWrite(java.lang.String) disallows write
      *             permission to this file object
      * @since 1.6
-     * @hide
      */
     public boolean setReadable(boolean readable, boolean ownerOnly) {
         if (path.isEmpty()) {
@@ -1004,7 +1000,6 @@ public class File implements Serializable, Comparable<File> {
      * Equivalent to setReadable(readable, true).
      * @see #setReadable(boolean, boolean)
      * @since 1.6
-     * @hide
      */
     public boolean setReadable(boolean readable) {
         return setReadable(readable, true);
@@ -1031,7 +1026,6 @@ public class File implements Serializable, Comparable<File> {
      *             SecurityManager.checkWrite(java.lang.String) disallows write
      *             permission to this file object
      * @since 1.6
-     * @hide
      */
     public boolean setWritable(boolean writable, boolean ownerOnly) {
         if (path.isEmpty()) {
@@ -1048,7 +1042,6 @@ public class File implements Serializable, Comparable<File> {
      * Equivalent to setWritable(writable, true).
      * @see #setWritable(boolean, boolean)
      * @since 1.6
-     * @hide
      */
     public boolean setWritable(boolean writable) {
         return setWritable(writable, true);
@@ -1524,7 +1517,6 @@ public class File implements Serializable, Comparable<File> {
      * Returns 0 if this path does not exist.
      *
      * @since 1.6
-     * @hide
      */
     public long getTotalSpace() {
         SecurityManager security = System.getSecurityManager();
@@ -1547,7 +1539,6 @@ public class File implements Serializable, Comparable<File> {
      * (The {@code getFreeSpace} method returns the number of bytes potentially available to root.)
      *
      * @since 1.6
-     * @hide
      */
     public long getUsableSpace() {
         SecurityManager security = System.getSecurityManager();
@@ -1566,7 +1557,6 @@ public class File implements Serializable, Comparable<File> {
      * be taken as a guarantee your application can actually write this many bytes.
      *
      * @since 1.6
-     * @hide
      */
     public long getFreeSpace() {
         SecurityManager security = System.getSecurityManager();
diff --git a/luni/src/main/java/java/io/IOError.java b/luni/src/main/java/java/io/IOError.java
index 244a3fa..e90731a 100644
--- a/luni/src/main/java/java/io/IOError.java
+++ b/luni/src/main/java/java/io/IOError.java
@@ -21,7 +21,6 @@ package java.io;
  * This error is thrown when a severe I/O error has happened.
  *
  * @since 1.6
- * @hide
  */
 public class IOError extends Error {
     private static final long serialVersionUID = 67100927991680413L;
diff --git a/luni/src/main/java/java/io/IOException.java b/luni/src/main/java/java/io/IOException.java
index fbd2048..f8ea130 100644
--- a/luni/src/main/java/java/io/IOException.java
+++ b/luni/src/main/java/java/io/IOException.java
@@ -54,7 +54,6 @@ public class IOException extends Exception {
      * @param cause
      *            The detail cause for the exception.
      * @since 1.6
-     * @hide
      */
     public IOException(String message, Throwable cause) {
         super(message, cause);
@@ -66,7 +65,6 @@ public class IOException extends Exception {
      * @param cause
      *            The detail cause for the exception.
      * @since 1.6
-     * @hide
      */
     public IOException(Throwable cause) {
         super(cause == null ? null : cause.toString(), cause);
diff --git a/luni/src/main/java/java/io/ObjectStreamClass.java b/luni/src/main/java/java/io/ObjectStreamClass.java
index 170c516..7f968af 100644
--- a/luni/src/main/java/java/io/ObjectStreamClass.java
+++ b/luni/src/main/java/java/io/ObjectStreamClass.java
@@ -958,7 +958,6 @@ public class ObjectStreamClass implements Serializable {
      *            descriptor
      * @return the descriptor
      * @since 1.6
-     * @hide
      */
     public static ObjectStreamClass lookupAny(Class<?> cl) {
         return  lookupStreamClass(cl);
diff --git a/luni/src/main/java/java/io/PipedInputStream.java b/luni/src/main/java/java/io/PipedInputStream.java
index 484cadb..05c5a4a 100644
--- a/luni/src/main/java/java/io/PipedInputStream.java
+++ b/luni/src/main/java/java/io/PipedInputStream.java
@@ -108,7 +108,6 @@ public class PipedInputStream extends InputStream {
      * @param pipeSize the size of the buffer in bytes.
      * @throws IllegalArgumentException if pipeSize is less than or equal to zero.
      * @since 1.6
-     * @hide
      */
     public PipedInputStream(int pipeSize) {
         if (pipeSize <= 0) {
@@ -127,7 +126,6 @@ public class PipedInputStream extends InputStream {
      * @throws IOException if an I/O error occurs.
      * @throws IllegalArgumentException if pipeSize is less than or equal to zero.
      * @since 1.6
-     * @hide
      */
     public PipedInputStream(PipedOutputStream out, int pipeSize) throws IOException {
         this(pipeSize);
diff --git a/luni/src/main/java/java/io/PipedReader.java b/luni/src/main/java/java/io/PipedReader.java
index d0d9759..3e955e6 100644
--- a/luni/src/main/java/java/io/PipedReader.java
+++ b/luni/src/main/java/java/io/PipedReader.java
@@ -108,7 +108,6 @@ public class PipedReader extends Reader {
      * @param pipeSize the size of the buffer in chars.
      * @throws IllegalArgumentException if pipeSize is less than or equal to zero.
      * @since 1.6
-     * @hide
      */
     public PipedReader(int pipeSize) {
         if (pipeSize <= 0) {
@@ -127,7 +126,6 @@ public class PipedReader extends Reader {
      * @throws IOException if an I/O error occurs
      * @throws IllegalArgumentException if pipeSize is less than or equal to zero.
      * @since 1.6
-     * @hide
      */
     public PipedReader(PipedWriter out, int pipeSize) throws IOException {
         this(pipeSize);
diff --git a/luni/src/main/java/java/io/PrintStream.java b/luni/src/main/java/java/io/PrintStream.java
index 1352a57..28abd98 100644
--- a/luni/src/main/java/java/io/PrintStream.java
+++ b/luni/src/main/java/java/io/PrintStream.java
@@ -242,7 +242,6 @@ public class PrintStream extends FilterOutputStream implements Appendable,
     /**
      * Sets the error state of the stream to false.
      * @since 1.6
-     * @hide
      */
     protected void clearError() {
         ioError = false;
diff --git a/luni/src/main/java/java/io/PrintWriter.java b/luni/src/main/java/java/io/PrintWriter.java
index efcebc2..da54b48 100644
--- a/luni/src/main/java/java/io/PrintWriter.java
+++ b/luni/src/main/java/java/io/PrintWriter.java
@@ -232,7 +232,6 @@ public class PrintWriter extends Writer {
     /**
      * Sets the error state of the stream to false.
      * @since 1.6
-     * @hide
      */
     protected void clearError() {
         synchronized (lock) {
diff --git a/luni/src/main/java/java/lang/Double.java b/luni/src/main/java/java/lang/Double.java
index 30b3b0b..d9b7de1 100644
--- a/luni/src/main/java/java/lang/Double.java
+++ b/luni/src/main/java/java/lang/Double.java
@@ -64,7 +64,6 @@ public final class Double extends Number implements Comparable<Double> {
      * Constant for the smallest positive normal value of the {@code double} type.
      *
      * @since 1.6
-     * @hide
      */
     public static final double MIN_NORMAL = 2.2250738585072014E-308;
 
@@ -73,7 +72,6 @@ public final class Double extends Number implements Comparable<Double> {
      * Equal to {@code Math.getExponent(Double.MAX_VALUE)}.
      *
      * @since 1.6
-     * @hide
      */
     public static final int MAX_EXPONENT = 1023;
 
@@ -82,7 +80,6 @@ public final class Double extends Number implements Comparable<Double> {
      * Equal to {@code Math.getExponent(Double.MIN_NORMAL)}.
      *
      * @since 1.6
-     * @hide
      */
     public static final int MIN_EXPONENT = -1022;
 
diff --git a/luni/src/main/java/java/lang/Enum.java b/luni/src/main/java/java/lang/Enum.java
index ad4f27d..5031fc5 100644
--- a/luni/src/main/java/java/lang/Enum.java
+++ b/luni/src/main/java/java/lang/Enum.java
@@ -183,7 +183,6 @@ public abstract class Enum<E extends Enum<E>> implements Serializable, Comparabl
      * Enum types may not have finalizers.
      *
      * @since 1.6
-     * @hide
      */
     @Override
     protected final void finalize() {
diff --git a/luni/src/main/java/java/lang/Float.java b/luni/src/main/java/java/lang/Float.java
index 5942cf9..ba2bc8e 100644
--- a/luni/src/main/java/java/lang/Float.java
+++ b/luni/src/main/java/java/lang/Float.java
@@ -61,7 +61,6 @@ public final class Float extends Number implements Comparable<Float> {
      * Constant for the smallest positive normal value of the {@code float} type.
      *
      * @since 1.6
-     * @hide
      */
     public static final float MIN_NORMAL = 1.1754943508222875E-38f;
 
@@ -70,7 +69,6 @@ public final class Float extends Number implements Comparable<Float> {
      * Equal to {@code Math.getExponent(Float.MAX_VALUE)}.
      *
      * @since 1.6
-     * @hide
      */
     public static final int MAX_EXPONENT = 127;
 
@@ -79,7 +77,6 @@ public final class Float extends Number implements Comparable<Float> {
      * Equal to {@code Math.getExponent(Float.MIN_NORMAL)}.
      *
      * @since 1.6
-     * @hide
      */
     public static final int MIN_EXPONENT = -126;
 
diff --git a/luni/src/main/java/java/lang/Math.java b/luni/src/main/java/java/lang/Math.java
index d0adb2a..33b8dba 100644
--- a/luni/src/main/java/java/lang/Math.java
+++ b/luni/src/main/java/java/lang/Math.java
@@ -1097,7 +1097,6 @@ public final class Math {
      * If {@code sign} is NaN, the sign of the result is arbitrary.
      * If you need a determinate sign in such cases, use {@code StrictMath.copySign}.
      * @since 1.6
-     * @hide
      */
     public static native double copySign(double magnitude, double sign);
 
@@ -1106,14 +1105,12 @@ public final class Math {
      * If {@code sign} is NaN, the sign of the result is arbitrary.
      * If you need a determinate sign in such cases, use {@code StrictMath.copySign}.
      * @since 1.6
-     * @hide
      */
     public static native float copySign(float magnitude, float sign);
 
     /**
      * Returns the exponent of float {@code f}.
      * @since 1.6
-     * @hide
      */
     public static int getExponent(float f) {
         int bits = Float.floatToRawIntBits(f);
@@ -1124,7 +1121,6 @@ public final class Math {
     /**
      * Returns the exponent of double {@code d}.
      * @since 1.6
-     * @hide
      */
     public static int getExponent(double d) {
         long bits = Double.doubleToRawLongBits(d);
@@ -1135,7 +1131,6 @@ public final class Math {
     /**
      * Returns the next double after {@code start} in the given {@code direction}.
      * @since 1.6
-     * @hide
      */
     public static double nextAfter(double start, double direction) {
         if (start == 0 && direction == 0) {
@@ -1147,7 +1142,6 @@ public final class Math {
     /**
      * Returns the next float after {@code start} in the given {@code direction}.
      * @since 1.6
-     * @hide
      */
     public static float nextAfter(float start, double direction) {
         if (Float.isNaN(start) || Double.isNaN(direction)) {
@@ -1192,7 +1186,6 @@ public final class Math {
     /**
      * Returns the next double larger than {@code d}.
      * @since 1.6
-     * @hide
      */
     public static double nextUp(double d) {
         if (Double.isNaN(d)) {
@@ -1213,7 +1206,6 @@ public final class Math {
     /**
      * Returns the next float larger than {@code f}.
      * @since 1.6
-     * @hide
      */
     public static float nextUp(float f) {
         if (Float.isNaN(f)) {
@@ -1234,7 +1226,6 @@ public final class Math {
     /**
      * Returns {@code d} * 2^{@code scaleFactor}. The result may be rounded.
      * @since 1.6
-     * @hide
      */
     public static double scalb(double d, int scaleFactor) {
         if (Double.isNaN(d) || Double.isInfinite(d) || d == 0) {
@@ -1292,7 +1283,6 @@ public final class Math {
     /**
      * Returns {@code d} * 2^{@code scaleFactor}. The result may be rounded.
      * @since 1.6
-     * @hide
      */
     public static float scalb(float d, int scaleFactor) {
         if (Float.isNaN(d) || Float.isInfinite(d) || d == 0) {
diff --git a/luni/src/main/java/java/lang/StrictMath.java b/luni/src/main/java/java/lang/StrictMath.java
index 52f93bd..50c96f8 100644
--- a/luni/src/main/java/java/lang/StrictMath.java
+++ b/luni/src/main/java/java/lang/StrictMath.java
@@ -1040,7 +1040,6 @@ public final class StrictMath {
      * Returns a double with the given magnitude and the sign of {@code sign}.
      * If {@code sign} is NaN, the sign of the result is positive.
      * @since 1.6
-     * @hide
      */
     public static double copySign(double magnitude, double sign) {
         return Math.copySign(magnitude, sign);
@@ -1050,7 +1049,6 @@ public final class StrictMath {
      * Returns a float with the given magnitude and the sign of {@code sign}.
      * If {@code sign} is NaN, the sign of the result is positive.
      * @since 1.6
-     * @hide
      */
     public static float copySign(float magnitude, float sign) {
         return Math.copySign(magnitude, sign);
@@ -1059,7 +1057,6 @@ public final class StrictMath {
     /**
      * Returns the exponent of float {@code f}.
      * @since 1.6
-     * @hide
      */
     public static int getExponent(float f) {
         return Math.getExponent(f);
@@ -1068,7 +1065,6 @@ public final class StrictMath {
     /**
      * Returns the exponent of double {@code d}.
      * @since 1.6
-     * @hide
      */
     public static int getExponent(double d){
         return Math.getExponent(d);
@@ -1077,7 +1073,6 @@ public final class StrictMath {
     /**
      * Returns the next double after {@code start} in the given {@code direction}.
      * @since 1.6
-     * @hide
      */
     public static double nextAfter(double start, double direction) {
         if (start == 0 && direction == 0) {
@@ -1089,7 +1084,6 @@ public final class StrictMath {
     /**
      * Returns the next float after {@code start} in the given {@code direction}.
      * @since 1.6
-     * @hide
      */
     public static float nextAfter(float start, double direction) {
         return Math.nextAfter(start, direction);
@@ -1098,7 +1092,6 @@ public final class StrictMath {
     /**
      * Returns the next double larger than {@code d}.
      * @since 1.6
-     * @hide
      */
     public static double nextUp(double d) {
         return Math.nextUp(d);
@@ -1107,7 +1100,6 @@ public final class StrictMath {
     /**
      * Returns the next float larger than {@code f}.
      * @since 1.6
-     * @hide
      */
     public static float nextUp(float f) {
         return Math.nextUp(f);
@@ -1116,7 +1108,6 @@ public final class StrictMath {
     /**
      * Returns {@code d} * 2^{@code scaleFactor}. The result may be rounded.
      * @since 1.6
-     * @hide
      */
     public static double scalb(double d, int scaleFactor) {
         if (Double.isNaN(d) || Double.isInfinite(d) || d == 0) {
@@ -1175,7 +1166,6 @@ public final class StrictMath {
     /**
      * Returns {@code d} * 2^{@code scaleFactor}. The result may be rounded.
      * @since 1.6
-     * @hide
      */
     public static float scalb(float d, int scaleFactor) {
         if (Float.isNaN(d) || Float.isInfinite(d) || d == 0) {
diff --git a/luni/src/main/java/java/lang/String.java b/luni/src/main/java/java/lang/String.java
index 7e9a3cd..5407c7a 100644
--- a/luni/src/main/java/java/lang/String.java
+++ b/luni/src/main/java/java/lang/String.java
@@ -448,7 +448,6 @@ public final class String implements Serializable, Comparable<String>, CharSeque
      * @see #valueOf(long)
      * @see #valueOf(Object)
      * @since 1.6
-     * @hide
      */
     public String(byte[] data, int start, int length, final Charset encoding) {
         if (encoding == null) {
@@ -489,7 +488,6 @@ public final class String implements Serializable, Comparable<String>, CharSeque
      * @see #valueOf(long)
      * @see #valueOf(Object)
      * @since 1.6
-     * @hide
      */
     public String(byte[] data, Charset encoding) {
         this(data, 0, data.length, encoding);
@@ -1040,7 +1038,6 @@ public final class String implements Serializable, Comparable<String>, CharSeque
      * @param encoding the encoding
      *
      * @since 1.6
-     * @hide
      */
     public byte[] getBytes(Charset encoding) {
         CharBuffer chars = CharBuffer.wrap(this.value, this.offset, this.count);
@@ -1285,7 +1282,6 @@ public final class String implements Serializable, Comparable<String>, CharSeque
      * Returns true if the length of this string is 0.
      *
      * @since 1.6
-     * @hide
      */
     public boolean isEmpty() {
         return count == 0;
diff --git a/luni/src/main/java/java/lang/System.java b/luni/src/main/java/java/lang/System.java
index be45907..56265a4 100644
--- a/luni/src/main/java/java/lang/System.java
+++ b/luni/src/main/java/java/lang/System.java
@@ -470,7 +470,6 @@ public final class System {
      * Not all VMs will have an associated console. A console is typically only
      * available for programs run from the command line.
      * @since 1.6
-     * @hide
      */
     public static Console console() {
         return Console.getConsole();
diff --git a/luni/src/main/java/java/net/IDN.java b/luni/src/main/java/java/net/IDN.java
index 3ac9340..df9ea2a 100644
--- a/luni/src/main/java/java/net/IDN.java
+++ b/luni/src/main/java/java/net/IDN.java
@@ -25,7 +25,6 @@ import com.ibm.icu4jni.text.NativeIDN;
  * <p>See <a href="http://www.ietf.org/rfc/rfc3490.txt">RFC 3490</a> for full details.
  *
  * @since 1.6
- * @hide
  */
 public final class IDN {
     /**
diff --git a/luni/src/main/java/java/net/InterfaceAddress.java b/luni/src/main/java/java/net/InterfaceAddress.java
index 2fa99f7..45fc236 100644
--- a/luni/src/main/java/java/net/InterfaceAddress.java
+++ b/luni/src/main/java/java/net/InterfaceAddress.java
@@ -21,7 +21,6 @@ package java.net;
  * These are passed back from the JNI behind NetworkInterface.getNetworkInterfaces.
  * Multiple addresses for the same interface are collected together on the Java side.
  *
- * @hide
  * @since 1.6
  */
 public class InterfaceAddress {
diff --git a/luni/src/main/java/java/net/NetworkInterface.java b/luni/src/main/java/java/net/NetworkInterface.java
index 5790c01..4b77916 100644
--- a/luni/src/main/java/java/net/NetworkInterface.java
+++ b/luni/src/main/java/java/net/NetworkInterface.java
@@ -365,7 +365,6 @@ public final class NetworkInterface extends Object {
      *
      * @return a List of the InterfaceAddresses for this network interface.
      * @since 1.6
-     * @hide
      */
     public List<InterfaceAddress> getInterfaceAddresses() {
         SecurityManager sm = System.getSecurityManager();
@@ -393,7 +392,6 @@ public final class NetworkInterface extends Object {
      *
      * @return an Enumeration of all the sub-interfaces of this network interface
      * @since 1.6
-     * @hide
      */
     public Enumeration<NetworkInterface> getSubInterfaces() {
         return Collections.enumeration(children);
@@ -405,7 +403,6 @@ public final class NetworkInterface extends Object {
      *
      * @return the NetworkInterface this interface is attached to.
      * @since 1.6
-     * @hide
      */
     public NetworkInterface getParent() {
         return parent;
@@ -417,7 +414,6 @@ public final class NetworkInterface extends Object {
      * @return true if the interface is up.
      * @throws SocketException if an I/O error occurs.
      * @since 1.6
-     * @hide
      */
     public boolean isUp() throws SocketException {
         if (addresses.isEmpty()) {
@@ -433,7 +429,6 @@ public final class NetworkInterface extends Object {
      * @return true if the interface is a loopback interface.
      * @throws SocketException if an I/O error occurs.
      * @since 1.6
-     * @hide
      */
     public boolean isLoopback() throws SocketException {
         if (addresses.isEmpty()) {
@@ -450,7 +445,6 @@ public final class NetworkInterface extends Object {
      * @return true if the interface is point-to-point.
      * @throws SocketException if an I/O error occurs.
      * @since 1.6
-     * @hide
      */
     public boolean isPointToPoint() throws SocketException {
         if (addresses.isEmpty()) {
@@ -465,7 +459,6 @@ public final class NetworkInterface extends Object {
      *
      * @throws SocketException if an I/O error occurs.
      * @since 1.6
-     * @hide
      */
     public boolean supportsMulticast() throws SocketException {
         if (addresses.isEmpty()) {
@@ -483,7 +476,6 @@ public final class NetworkInterface extends Object {
      *         doesn't exist or is not accessible.
      * @throws SocketException if an I/O error occurs.
      * @since 1.6
-     * @hide
      */
     public byte[] getHardwareAddress() throws SocketException {
         if (addresses.isEmpty()) {
@@ -499,7 +491,6 @@ public final class NetworkInterface extends Object {
      * @return the value of the MTU for the interface.
      * @throws SocketException if an I/O error occurs.
      * @since 1.6
-     * @hide
      */
     public int getMTU() throws SocketException {
         if (addresses.isEmpty()) {
@@ -520,7 +511,6 @@ public final class NetworkInterface extends Object {
      *
      * @return true if this interface is a virtual interface.
      * @since 1.6
-     * @hide
      */
     public boolean isVirtual() {
         return parent != null;
diff --git a/luni/src/main/java/java/nio/Buffer.java b/luni/src/main/java/java/nio/Buffer.java
index 8c423a3..e141ea0 100644
--- a/luni/src/main/java/java/nio/Buffer.java
+++ b/luni/src/main/java/java/nio/Buffer.java
@@ -124,7 +124,6 @@ public abstract class Buffer {
      * @throws ReadOnlyBufferException if the buffer is read-only
      *         UnsupportedOperationException if the buffer does not expose an array
      * @since 1.6
-     * @hide
      */
     public abstract Object array();
 
@@ -143,7 +142,6 @@ public abstract class Buffer {
      * @throws ReadOnlyBufferException if the buffer is read-only
      *         UnsupportedOperationException if the buffer does not expose an array
      * @since 1.6
-     * @hide
      */
     public abstract int arrayOffset();
 
@@ -196,7 +194,6 @@ public abstract class Buffer {
      * {@code UnsupportedOperationException}, nor does it return true for buffers backed by
      * read-only arrays, because the other methods would throw {@code ReadOnlyBufferException}.
      * @since 1.6
-     * @hide
      */
     public abstract boolean hasArray();
 
@@ -214,7 +211,6 @@ public abstract class Buffer {
     /**
      * Returns true if this is a direct buffer.
      * @since 1.6
-     * @hide
      */
     public abstract boolean isDirect();
 
diff --git a/luni/src/main/java/java/text/DateFormatSymbols.java b/luni/src/main/java/java/text/DateFormatSymbols.java
index 3965a60..2406e57 100644
--- a/luni/src/main/java/java/text/DateFormatSymbols.java
+++ b/luni/src/main/java/java/text/DateFormatSymbols.java
@@ -113,7 +113,6 @@ public class DateFormatSymbols implements Serializable, Cloneable {
      *
      * @return an instance of {@code DateFormatSymbols}
      * @since 1.6
-     * @hide
      */
     public static final DateFormatSymbols getInstance() {
         return getInstance(Locale.getDefault());
@@ -126,7 +125,6 @@ public class DateFormatSymbols implements Serializable, Cloneable {
      * @return an instance of {@code DateFormatSymbols}
      * @throws NullPointerException if {@code locale == null}
      * @since 1.6
-     * @hide
      */
     public static final DateFormatSymbols getInstance(Locale locale) {
         if (locale == null) {
@@ -139,7 +137,6 @@ public class DateFormatSymbols implements Serializable, Cloneable {
      * Returns an array of locales for which custom {@code DateFormatSymbols} instances
      * are available.
      * @since 1.6
-     * @hide
      */
     public static Locale[] getAvailableLocales() {
         return ICU.getAvailableDateFormatSymbolsLocales();
diff --git a/luni/src/main/java/java/text/DecimalFormat.java b/luni/src/main/java/java/text/DecimalFormat.java
index 2c9c68d..ace21ff 100644
--- a/luni/src/main/java/java/text/DecimalFormat.java
+++ b/luni/src/main/java/java/text/DecimalFormat.java
@@ -1295,7 +1295,6 @@ public class DecimalFormat extends NumberFormat {
     /**
      * Returns the {@code RoundingMode} used by this {@code NumberFormat}.
      * @since 1.6
-     * @hide
      */
     public RoundingMode getRoundingMode() {
         return roundingMode;
@@ -1304,7 +1303,6 @@ public class DecimalFormat extends NumberFormat {
     /**
      * Sets the {@code RoundingMode} used by this {@code NumberFormat}.
      * @since 1.6
-     * @hide
      */
     public void setRoundingMode(RoundingMode roundingMode) {
         if (roundingMode == null) {
diff --git a/luni/src/main/java/java/text/DecimalFormatSymbols.java b/luni/src/main/java/java/text/DecimalFormatSymbols.java
index 07e9d9c..2c6aa15 100644
--- a/luni/src/main/java/java/text/DecimalFormatSymbols.java
+++ b/luni/src/main/java/java/text/DecimalFormatSymbols.java
@@ -113,7 +113,6 @@ public final class DecimalFormatSymbols implements Cloneable, Serializable {
      *
      * @return an instance of {@code DecimalFormatSymbols}
      * @since 1.6
-     * @hide
      */
     public static final DecimalFormatSymbols getInstance() {
         return getInstance(Locale.getDefault());
@@ -126,7 +125,6 @@ public final class DecimalFormatSymbols implements Cloneable, Serializable {
      * @return an instance of {@code DecimalFormatSymbols}
      * @throws NullPointerException if {@code locale == null}
      * @since 1.6
-     * @hide
      */
     public static final DecimalFormatSymbols getInstance(Locale locale) {
         if (locale == null) {
@@ -139,7 +137,6 @@ public final class DecimalFormatSymbols implements Cloneable, Serializable {
      * Returns an array of locales for which custom {@code DecimalFormatSymbols} instances
      * are available.
      * @since 1.6
-     * @hide
      */
     public static Locale[] getAvailableLocales() {
         return ICU.getAvailableDecimalFormatSymbolsLocales();
@@ -353,7 +350,6 @@ public final class DecimalFormatSymbols implements Cloneable, Serializable {
     /*
      * Returns the string used to separate mantissa and exponent. Typically "E", as in "1.2E3".
      * @since 1.6
-     * @hide
      */
     public String getExponentSeparator() {
         return exponentSeparator;
@@ -559,7 +555,6 @@ public final class DecimalFormatSymbols implements Cloneable, Serializable {
     /**
      * Sets the string used to separate mantissa and exponent. Typically "E", as in "1.2E3".
      * @since 1.6
-     * @hide
      */
     public void setExponentSeparator(String value) {
         if (value == null) {
diff --git a/luni/src/main/java/java/text/Normalizer.java b/luni/src/main/java/java/text/Normalizer.java
index cfc30ae..e5d231e 100644
--- a/luni/src/main/java/java/text/Normalizer.java
+++ b/luni/src/main/java/java/text/Normalizer.java
@@ -24,7 +24,6 @@ import com.ibm.icu4jni.text.NativeNormalizer;
  * Unicode Normalization Forms</a>. Normalization can decompose and compose
  * characters for equivalency checking.
  *
- * @hide
  * @since 1.6
  */
 public final class Normalizer {
diff --git a/luni/src/main/java/java/text/NumberFormat.java b/luni/src/main/java/java/text/NumberFormat.java
index 730dc5d..4ac1bf7 100644
--- a/luni/src/main/java/java/text/NumberFormat.java
+++ b/luni/src/main/java/java/text/NumberFormat.java
@@ -870,7 +870,6 @@ public abstract class NumberFormat extends Format {
      * implementation in {@code NumberFormat} throws {@code UnsupportedOperationException}.
      * Subclasses for which a rounding mode is meaningful are expected to override this method.
      * @since 1.6
-     * @hide
      */
     public RoundingMode getRoundingMode() {
         throw new UnsupportedOperationException();
@@ -881,7 +880,6 @@ public abstract class NumberFormat extends Format {
      * implementation in {@code NumberFormat} throws {@code UnsupportedOperationException}.
      * Subclasses for which a rounding mode is meaningful are expected to override this method.
      * @since 1.6
-     * @hide
      */
     public void setRoundingMode(RoundingMode roundingMode) {
         throw new UnsupportedOperationException();
diff --git a/luni/src/main/java/java/util/Arrays.java b/luni/src/main/java/java/util/Arrays.java
index a551859..8928594 100644
--- a/luni/src/main/java/java/util/Arrays.java
+++ b/luni/src/main/java/java/util/Arrays.java
@@ -198,7 +198,6 @@ public class Arrays {
      * @throws IllegalArgumentException if {@code startIndex > endIndex}
      * @throws ArrayIndexOutOfBoundsException if {@code startIndex < 0 || endIndex > array.length}
      * @since 1.6
-     * @hide
      */
     public static int binarySearch(byte[] array, int startIndex, int endIndex, byte value) {
         checkBinarySearchBounds(startIndex, endIndex, array.length);
@@ -249,7 +248,6 @@ public class Arrays {
      * @throws IllegalArgumentException if {@code startIndex > endIndex}
      * @throws ArrayIndexOutOfBoundsException if {@code startIndex < 0 || endIndex > array.length}
      * @since 1.6
-     * @hide
      */
     public static int binarySearch(char[] array, int startIndex, int endIndex, char value) {
         checkBinarySearchBounds(startIndex, endIndex, array.length);
@@ -300,7 +298,6 @@ public class Arrays {
      * @throws IllegalArgumentException if {@code startIndex > endIndex}
      * @throws ArrayIndexOutOfBoundsException if {@code startIndex < 0 || endIndex > array.length}
      * @since 1.6
-     * @hide
      */
     public static int binarySearch(double[] array, int startIndex, int endIndex, double value) {
         checkBinarySearchBounds(startIndex, endIndex, array.length);
@@ -362,7 +359,6 @@ public class Arrays {
      * @throws IllegalArgumentException if {@code startIndex > endIndex}
      * @throws ArrayIndexOutOfBoundsException if {@code startIndex < 0 || endIndex > array.length}
      * @since 1.6
-     * @hide
      */
     public static int binarySearch(float[] array, int startIndex, int endIndex, float value) {
         checkBinarySearchBounds(startIndex, endIndex, array.length);
@@ -424,7 +420,6 @@ public class Arrays {
      * @throws IllegalArgumentException if {@code startIndex > endIndex}
      * @throws ArrayIndexOutOfBoundsException if {@code startIndex < 0 || endIndex > array.length}
      * @since 1.6
-     * @hide
      */
     public static int binarySearch(int[] array, int startIndex, int endIndex, int value) {
         checkBinarySearchBounds(startIndex, endIndex, array.length);
@@ -475,7 +470,6 @@ public class Arrays {
      * @throws IllegalArgumentException if {@code startIndex > endIndex}
      * @throws ArrayIndexOutOfBoundsException if {@code startIndex < 0 || endIndex > array.length}
      * @since 1.6
-     * @hide
      */
     public static int binarySearch(long[] array, int startIndex, int endIndex, long value) {
         checkBinarySearchBounds(startIndex, endIndex, array.length);
@@ -532,7 +526,6 @@ public class Arrays {
      * @throws IllegalArgumentException if {@code startIndex > endIndex}
      * @throws ArrayIndexOutOfBoundsException if {@code startIndex < 0 || endIndex > array.length}
      * @since 1.6
-     * @hide
      */
     public static int binarySearch(Object[] array, int startIndex, int endIndex, Object value) {
         checkBinarySearchBounds(startIndex, endIndex, array.length);
@@ -557,7 +550,7 @@ public class Arrays {
 
     /**
      * Performs a binary search for {@code value} in the ascending sorted array {@code array},
-     * using {@comparator} to compare elements.
+     * using {@code comparator} to compare elements.
      * Searching in an unsorted array has an undefined result. It's also undefined which element
      * is found if there are multiple occurrences of the same element.
      *
@@ -577,7 +570,7 @@ public class Arrays {
     /**
      * Performs a binary search for {@code value} in the ascending sorted array {@code array},
      * in the range specified by fromIndex (inclusive) and toIndex (exclusive),
-     * using {@comparator} to compare elements.
+     * using {@code comparator} to compare elements.
      * Searching in an unsorted array has an undefined result. It's also undefined which element
      * is found if there are multiple occurrences of the same element.
      *
@@ -594,7 +587,6 @@ public class Arrays {
      * @throws IllegalArgumentException if {@code startIndex > endIndex}
      * @throws ArrayIndexOutOfBoundsException if {@code startIndex < 0 || endIndex > array.length}
      * @since 1.6
-     * @hide
      */
     public static <T> int binarySearch(T[] array, int startIndex, int endIndex, T value,
             Comparator<? super T> comparator) {
@@ -650,7 +642,6 @@ public class Arrays {
      * @throws IllegalArgumentException if {@code startIndex > endIndex}
      * @throws ArrayIndexOutOfBoundsException if {@code startIndex < 0 || endIndex > array.length}
      * @since 1.6
-     * @hide
      */
     public static int binarySearch(short[] array, int startIndex, int endIndex, short value) {
         checkBinarySearchBounds(startIndex, endIndex, array.length);
@@ -2518,7 +2509,6 @@ public class Arrays {
      * @throws NegativeArraySizeException if {@code newLength < 0}
      * @throws NullPointerException if {@code original == null}
      * @since 1.6
-     * @hide
      */
     public static boolean[] copyOf(boolean[] original, int newLength) {
         if (newLength < 0) {
@@ -2538,7 +2528,6 @@ public class Arrays {
      * @throws NegativeArraySizeException if {@code newLength < 0}
      * @throws NullPointerException if {@code original == null}
      * @since 1.6
-     * @hide
      */
     public static byte[] copyOf(byte[] original, int newLength) {
         if (newLength < 0) {
@@ -2558,7 +2547,6 @@ public class Arrays {
      * @throws NegativeArraySizeException if {@code newLength < 0}
      * @throws NullPointerException if {@code original == null}
      * @since 1.6
-     * @hide
      */
     public static char[] copyOf(char[] original, int newLength) {
         if (newLength < 0) {
@@ -2578,7 +2566,6 @@ public class Arrays {
      * @throws NegativeArraySizeException if {@code newLength < 0}
      * @throws NullPointerException if {@code original == null}
      * @since 1.6
-     * @hide
      */
     public static double[] copyOf(double[] original, int newLength) {
         if (newLength < 0) {
@@ -2598,7 +2585,6 @@ public class Arrays {
      * @throws NegativeArraySizeException if {@code newLength < 0}
      * @throws NullPointerException if {@code original == null}
      * @since 1.6
-     * @hide
      */
     public static float[] copyOf(float[] original, int newLength) {
         if (newLength < 0) {
@@ -2618,7 +2604,6 @@ public class Arrays {
      * @throws NegativeArraySizeException if {@code newLength < 0}
      * @throws NullPointerException if {@code original == null}
      * @since 1.6
-     * @hide
      */
     public static int[] copyOf(int[] original, int newLength) {
         if (newLength < 0) {
@@ -2638,7 +2623,6 @@ public class Arrays {
      * @throws NegativeArraySizeException if {@code newLength < 0}
      * @throws NullPointerException if {@code original == null}
      * @since 1.6
-     * @hide
      */
     public static long[] copyOf(long[] original, int newLength) {
         if (newLength < 0) {
@@ -2658,7 +2642,6 @@ public class Arrays {
      * @throws NegativeArraySizeException if {@code newLength < 0}
      * @throws NullPointerException if {@code original == null}
      * @since 1.6
-     * @hide
      */
     public static short[] copyOf(short[] original, int newLength) {
         if (newLength < 0) {
@@ -2679,7 +2662,6 @@ public class Arrays {
      * @throws NegativeArraySizeException if {@code newLength < 0}
      * @throws NullPointerException if {@code original == null}
      * @since 1.6
-     * @hide
      */
     public static <T> T[] copyOf(T[] original, int newLength) {
         if (original == null) {
@@ -2706,7 +2688,6 @@ public class Arrays {
      * @throws NullPointerException if {@code original == null}
      * @throws ArrayStoreException if a value in {@code original} is incompatible with T
      * @since 1.6
-     * @hide
      */
     public static <T, U> T[] copyOf(U[] original, int newLength, Class<? extends T[]> newType) {
         // We use the null pointer check in copyOfRange for exception priority compatibility.
@@ -2730,7 +2711,6 @@ public class Arrays {
      * @throws IllegalArgumentException if {@code start > end}
      * @throws NullPointerException if {@code original == null}
      * @since 1.6
-     * @hide
      */
     public static boolean[] copyOfRange(boolean[] original, int start, int end) {
         if (start > end) {
@@ -2761,7 +2741,6 @@ public class Arrays {
      * @throws IllegalArgumentException if {@code start > end}
      * @throws NullPointerException if {@code original == null}
      * @since 1.6
-     * @hide
      */
     public static byte[] copyOfRange(byte[] original, int start, int end) {
         if (start > end) {
@@ -2792,7 +2771,6 @@ public class Arrays {
      * @throws IllegalArgumentException if {@code start > end}
      * @throws NullPointerException if {@code original == null}
      * @since 1.6
-     * @hide
      */
     public static char[] copyOfRange(char[] original, int start, int end) {
         if (start > end) {
@@ -2823,7 +2801,6 @@ public class Arrays {
      * @throws IllegalArgumentException if {@code start > end}
      * @throws NullPointerException if {@code original == null}
      * @since 1.6
-     * @hide
      */
     public static double[] copyOfRange(double[] original, int start, int end) {
         if (start > end) {
@@ -2854,7 +2831,6 @@ public class Arrays {
      * @throws IllegalArgumentException if {@code start > end}
      * @throws NullPointerException if {@code original == null}
      * @since 1.6
-     * @hide
      */
     public static float[] copyOfRange(float[] original, int start, int end) {
         if (start > end) {
@@ -2885,7 +2861,6 @@ public class Arrays {
      * @throws IllegalArgumentException if {@code start > end}
      * @throws NullPointerException if {@code original == null}
      * @since 1.6
-     * @hide
      */
     public static int[] copyOfRange(int[] original, int start, int end) {
         if (start > end) {
@@ -2916,7 +2891,6 @@ public class Arrays {
      * @throws IllegalArgumentException if {@code start > end}
      * @throws NullPointerException if {@code original == null}
      * @since 1.6
-     * @hide
      */
     public static long[] copyOfRange(long[] original, int start, int end) {
         if (start > end) {
@@ -2947,7 +2921,6 @@ public class Arrays {
      * @throws IllegalArgumentException if {@code start > end}
      * @throws NullPointerException if {@code original == null}
      * @since 1.6
-     * @hide
      */
     public static short[] copyOfRange(short[] original, int start, int end) {
         if (start > end) {
@@ -2979,7 +2952,6 @@ public class Arrays {
      * @throws IllegalArgumentException if {@code start > end}
      * @throws NullPointerException if {@code original == null}
      * @since 1.6
-     * @hide
      */
     @SuppressWarnings("unchecked")
     public static <T> T[] copyOfRange(T[] original, int start, int end) {
@@ -3014,7 +2986,6 @@ public class Arrays {
      * @throws NullPointerException if {@code original == null}
      * @throws ArrayStoreException if a value in {@code original} is incompatible with T
      * @since 1.6
-     * @hide
      */
     @SuppressWarnings("unchecked")
     public static <T, U> T[] copyOfRange(U[] original, int start, int end, Class<? extends T[]> newType) {
diff --git a/luni/src/main/java/java/util/Calendar.java b/luni/src/main/java/java/util/Calendar.java
index 0b048d8..73616cd 100644
--- a/luni/src/main/java/java/util/Calendar.java
+++ b/luni/src/main/java/java/util/Calendar.java
@@ -673,7 +673,6 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
      * Requests both {@code SHORT} and {@code LONG} styles in the map returned by
      * {@link getDisplayNames}.
      * @since 1.6
-     * @hide
      */
     public static final int ALL_STYLES = 0;
 
@@ -681,7 +680,6 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
      * Requests short names (such as "Jan") from
      * {@link getDisplayName} or {@link getDisplayNames}.
      * @since 1.6
-     * @hide
      */
     public static final int SHORT = 1;
 
@@ -689,7 +687,6 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
      * Requests long names (such as "January") from
      * {@link getDisplayName} or {@link getDisplayNames}.
      * @since 1.6
-     * @hide
      */
     public static final int LONG = 2;
 
@@ -1428,7 +1425,6 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
      * @throws NullPointerException if {@code locale == null}
      * @throws IllegalArgumentException if {@code field} or {@code style} is invalid
      * @since 1.6
-     * @hide
      */
     public String getDisplayName(int field, int style, Locale locale) {
         // TODO: the RI's documentation says ALL_STYLES is invalid, but actually treats it as SHORT.
@@ -1480,7 +1476,6 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
      * @throws NullPointerException if {@code locale == null}
      * @throws IllegalArgumentException if {@code field} or {@code style} is invalid
      * @since 1.6
-     * @hide
      */
     public Map<String, Integer> getDisplayNames(int field, int style, Locale locale) {
         checkStyle(style);
diff --git a/luni/src/main/java/java/util/ListResourceBundle.java b/luni/src/main/java/java/util/ListResourceBundle.java
index b81f0cb..e49c9e3 100644
--- a/luni/src/main/java/java/util/ListResourceBundle.java
+++ b/luni/src/main/java/java/util/ListResourceBundle.java
@@ -132,7 +132,6 @@ public abstract class ListResourceBundle extends ResourceBundle {
      *
      * @return a set of the keys in this ResourceBundle but not in its parents.
      * @since 1.6
-     * @hide
      */
     protected Set<String> handleKeySet() {
         initializeTable();
diff --git a/luni/src/main/java/java/util/Locale.java b/luni/src/main/java/java/util/Locale.java
index 511c426..fa8596a 100644
--- a/luni/src/main/java/java/util/Locale.java
+++ b/luni/src/main/java/java/util/Locale.java
@@ -166,7 +166,6 @@ public final class Locale implements Cloneable, Serializable {
      * country, and variant.
      *
      * @since 1.6
-     * @hide
      */
     public static final Locale ROOT = new Locale("", "", "");
 
diff --git a/luni/src/main/java/java/util/Properties.java b/luni/src/main/java/java/util/Properties.java
index fd9c3d6..c78784a 100644
--- a/luni/src/main/java/java/util/Properties.java
+++ b/luni/src/main/java/java/util/Properties.java
@@ -290,7 +290,6 @@ public class Properties extends Hashtable<Object, Object> {
      * @param in the {@code Reader}
      * @throws IOException
      * @since 1.6
-     * @hide
      */
     @SuppressWarnings("fallthrough")
     public synchronized void load(Reader in) throws IOException {
@@ -470,7 +469,6 @@ public class Properties extends Hashtable<Object, Object> {
      *
      * @return a set of keys in the property list
      * @since 1.6
-     * @hide
      */
     public Set<String> stringPropertyNames() {
         Hashtable<String, String> stringProperties = new Hashtable<String, String>();
@@ -562,7 +560,6 @@ public class Properties extends Hashtable<Object, Object> {
      * @throws IOException
      * @throws ClassCastException if a key or value is not a string
      * @since 1.6
-     * @hide
      */
     public synchronized void store(Writer writer, String comment) throws IOException {
         if (lineSeparator == null) {
diff --git a/luni/src/main/java/java/util/PropertyResourceBundle.java b/luni/src/main/java/java/util/PropertyResourceBundle.java
index 94d0ecf..4029ee1 100644
--- a/luni/src/main/java/java/util/PropertyResourceBundle.java
+++ b/luni/src/main/java/java/util/PropertyResourceBundle.java
@@ -58,7 +58,6 @@ public class PropertyResourceBundle extends ResourceBundle {
      * @param reader the {@code Reader}
      * @throws IOException
      * @since 1.6
-     * @hide
      */
     public PropertyResourceBundle(Reader reader) throws IOException {
         resources = new Properties();
diff --git a/luni/src/main/java/java/util/ResourceBundle.java b/luni/src/main/java/java/util/ResourceBundle.java
index 94bd546..be7c06d 100644
--- a/luni/src/main/java/java/util/ResourceBundle.java
+++ b/luni/src/main/java/java/util/ResourceBundle.java
@@ -235,7 +235,6 @@ public abstract class ResourceBundle {
      * @return the named resource bundle
      *
      * @since 1.6
-     * @hide
      */
     public static final ResourceBundle getBundle(String baseName, ResourceBundle.Control control) {
         return getBundle(baseName, Locale.getDefault(), getLoader(), control);
@@ -253,7 +252,6 @@ public abstract class ResourceBundle {
      * @return the named resource bundle
      *
      * @since 1.6
-     * @hide
      */
     public static final ResourceBundle getBundle(String baseName,
             Locale targetLocale, ResourceBundle.Control control) {
@@ -287,7 +285,6 @@ public abstract class ResourceBundle {
      * @return the named resource bundle
      *
      * @since 1.6
-     * @hide
      */
     public static ResourceBundle getBundle(String baseName,
             Locale targetLocale, ClassLoader loader,
@@ -721,7 +718,6 @@ public abstract class ResourceBundle {
      * However users can implement their own control.
      *
      * @since 1.6
-     * @hide
      */
     public static class Control {
         static List<String> listDefault = new ArrayList<String>();
diff --git a/luni/src/main/java/java/util/Scanner.java b/luni/src/main/java/java/util/Scanner.java
index 5ec0408..0245329 100644
--- a/luni/src/main/java/java/util/Scanner.java
+++ b/luni/src/main/java/java/util/Scanner.java
@@ -2192,7 +2192,6 @@ public final class Scanner implements Iterator<String> {
      *
      * @return this scanner
      * @since 1.6
-     * @hide
      */
     public Scanner reset() {
         delimiter = DEFAULT_DELIMITER;
diff --git a/luni/src/main/java/java/util/ServiceConfigurationError.java b/luni/src/main/java/java/util/ServiceConfigurationError.java
index 81cd36e..ffe1b32 100644
--- a/luni/src/main/java/java/util/ServiceConfigurationError.java
+++ b/luni/src/main/java/java/util/ServiceConfigurationError.java
@@ -20,7 +20,6 @@ package java.util;
 /**
  * Thrown when a service provider can't be loaded by {@link ServiceLoader}.
  * @since 1.6
- * @hide
  */
 public class ServiceConfigurationError extends Error {
     private static final long serialVersionUID = 74132770414881L;
diff --git a/luni/src/main/java/java/util/ServiceLoader.java b/luni/src/main/java/java/util/ServiceLoader.java
index c43d761..1608c1d 100644
--- a/luni/src/main/java/java/util/ServiceLoader.java
+++ b/luni/src/main/java/java/util/ServiceLoader.java
@@ -69,7 +69,6 @@ import java.security.PrivilegedAction;
  *
  * @param <S> the service class or interface
  * @since 1.6
- * @hide
  */
 public final class ServiceLoader<S> implements Iterable<S> {
     private final Class<S> service;
diff --git a/luni/src/main/java/java/util/TreeMap.java b/luni/src/main/java/java/util/TreeMap.java
index 63103de..5c0f8f4 100644
--- a/luni/src/main/java/java/util/TreeMap.java
+++ b/luni/src/main/java/java/util/TreeMap.java
@@ -118,8 +118,8 @@ public class TreeMap<K, V> extends AbstractMap<K, V>
      * Create a tree map ordered by {@code comparator}. This map's keys may only
      * be null if {@code comparator} permits.
      *
-     * @parameter comparator the comparator to order elements with, or {@code
-     *     null} to use the natural ordering.
+     * @param comparator the comparator to order elements with, or {@code null} to use the natural
+     * ordering.
      */
     @SuppressWarnings("unchecked") // unsafe! if comparator is null, this assumes K is comparable
     public TreeMap(Comparator<? super K> comparator) {
diff --git a/luni/src/main/java/java/util/logging/Logger.java b/luni/src/main/java/java/util/logging/Logger.java
index 5a04497..6c7dabb 100644
--- a/luni/src/main/java/java/util/logging/Logger.java
+++ b/luni/src/main/java/java/util/logging/Logger.java
@@ -97,7 +97,6 @@ public class Logger {
      * The name of the global logger. Before using this, see the discussion of how to use
      * {@code Logger} in the class documentation.
      * @since 1.6
-     * @hide
      */
     public static final String GLOBAL_LOGGER_NAME = "global";
 
diff --git a/luni/src/main/java/java/util/zip/DeflaterInputStream.java b/luni/src/main/java/java/util/zip/DeflaterInputStream.java
index d1d12a3..7c32034 100644
--- a/luni/src/main/java/java/util/zip/DeflaterInputStream.java
+++ b/luni/src/main/java/java/util/zip/DeflaterInputStream.java
@@ -26,7 +26,6 @@ import java.io.InputStream;
  * compressed data in the "deflate" format from the uncompressed
  * underlying stream.
  * @since 1.6
- * @hide
  */
 public class DeflaterInputStream extends FilterInputStream {
     private static final int DEFAULT_BUFFER_SIZE = 1024;
diff --git a/luni/src/main/java/java/util/zip/InflaterOutputStream.java b/luni/src/main/java/java/util/zip/InflaterOutputStream.java
index 9167419..a2d16f6 100644
--- a/luni/src/main/java/java/util/zip/InflaterOutputStream.java
+++ b/luni/src/main/java/java/util/zip/InflaterOutputStream.java
@@ -26,7 +26,6 @@ import java.io.OutputStream;
  * compressed data in the "deflate" format, and uncompressed data is
  * written to the underlying stream.
  * @since 1.6
- * @hide
  */
 public class InflaterOutputStream extends FilterOutputStream {
     private static final int DEFAULT_BUFFER_SIZE = 1024;
diff --git a/luni/src/main/java/java/util/zip/ZipError.java b/luni/src/main/java/java/util/zip/ZipError.java
index fa0218a..5718575 100644
--- a/luni/src/main/java/java/util/zip/ZipError.java
+++ b/luni/src/main/java/java/util/zip/ZipError.java
@@ -20,7 +20,6 @@ package java.util.zip;
 /**
  * Thrown when an unrecoverable ZIP error has occurred.
  * @since 1.6
- * @hide
  */
 public class ZipError extends InternalError {
     private static final long serialVersionUID = 853973422266861979L;