Remove explicit 8192 arguments to BufferedReader and friends.

These were clearly added just to shut up our own warning, and are now
unnecessary and misleading to future maintainers.

There's one barely-related change: InputStreamReader and OutputStreamWriter
are very similar, and this patch makes them more similar, and adds a few
missing modifiers from their fields.

Change-Id: I959011f914ff215e92bbfa41c1bac66465803685

8 files changed, 15 insertions, 57 deletions

diff --git a/luni/src/main/java/java/io/InputStreamReader.java b/luni/src/main/java/java/io/InputStreamReader.java
index 0b4de82..93581d4 100644
--- a/luni/src/main/java/java/io/InputStreamReader.java
+++ b/luni/src/main/java/java/io/InputStreamReader.java
@@ -44,13 +44,11 @@ import org.apache.harmony.luni.util.PriviAction;
 public class InputStreamReader extends Reader {
     private InputStream in;
 
-    private static final int BUFFER_SIZE = 8192;
-
     private boolean endOfInput = false;
 
-    CharsetDecoder decoder;
+    private CharsetDecoder decoder;
 
-    ByteBuffer bytes = ByteBuffer.allocate(BUFFER_SIZE);
+    private final ByteBuffer bytes = ByteBuffer.allocate(8192);
 
     /**
      * Constructs a new {@code InputStreamReader} on the {@link InputStream}
diff --git a/luni/src/main/java/java/io/OutputStreamWriter.java b/luni/src/main/java/java/io/OutputStreamWriter.java
index 226eea3..e5b4e71 100644
--- a/luni/src/main/java/java/io/OutputStreamWriter.java
+++ b/luni/src/main/java/java/io/OutputStreamWriter.java
@@ -41,7 +41,7 @@ import org.apache.harmony.luni.util.PriviAction;
  */
 public class OutputStreamWriter extends Writer {
 
-    private OutputStream out;
+    private final OutputStream out;
 
     private CharsetEncoder encoder;
 
diff --git a/luni/src/main/java/java/io/PrintWriter.java b/luni/src/main/java/java/io/PrintWriter.java
index 49a219d..34842a9 100644
--- a/luni/src/main/java/java/io/PrintWriter.java
+++ b/luni/src/main/java/java/io/PrintWriter.java
@@ -134,12 +134,7 @@ public class PrintWriter extends Writer {
      *             target file.
      */
     public PrintWriter(File file) throws FileNotFoundException {
-        // BEGIN android-modified
-        this(new OutputStreamWriter(
-                     new BufferedOutputStream(
-                             new FileOutputStream(file), 8192)),
-                false);
-        // END android-modified
+        this(new OutputStreamWriter(new BufferedOutputStream(new FileOutputStream(file))), false);
     }
 
     /**
@@ -165,12 +160,8 @@ public class PrintWriter extends Writer {
      */
     public PrintWriter(File file, String csn) throws FileNotFoundException,
             UnsupportedEncodingException {
-        // BEGIN android-modified
-        this(new OutputStreamWriter(
-                     new BufferedOutputStream(
-                             new FileOutputStream(file), 8192), csn),
+        this(new OutputStreamWriter(new BufferedOutputStream(new FileOutputStream(file)), csn),
                 false);
-        // END android-modified
     }
 
     /**
@@ -190,12 +181,8 @@ public class PrintWriter extends Writer {
      *             target file.
      */
     public PrintWriter(String fileName) throws FileNotFoundException {
-        // BEGIN android-modified
-        this(new OutputStreamWriter(
-                     new BufferedOutputStream(
-                             new FileOutputStream(fileName), 8192)),
+        this(new OutputStreamWriter(new BufferedOutputStream(new FileOutputStream(fileName))),
                 false);
-        // END android-modified
     }
 
      /**
@@ -222,12 +209,8 @@ public class PrintWriter extends Writer {
      */
     public PrintWriter(String fileName, String csn)
             throws FileNotFoundException, UnsupportedEncodingException {
-        // BEGIN android-modified
-        this(new OutputStreamWriter(
-                     new BufferedOutputStream(
-                             new FileOutputStream(fileName), 8192), csn),
+        this(new OutputStreamWriter(new BufferedOutputStream(new FileOutputStream(fileName)), csn),
                 false);
-        // END android-modified
     }
 
     /**
diff --git a/luni/src/main/java/java/net/ProxySelectorImpl.java b/luni/src/main/java/java/net/ProxySelectorImpl.java
index fa8d049..8230f99 100644
--- a/luni/src/main/java/java/net/ProxySelectorImpl.java
+++ b/luni/src/main/java/java/net/ProxySelectorImpl.java
@@ -56,9 +56,7 @@ class ProxySelectorImpl extends ProxySelector {
                 if (f.exists()) {
                     try {
                         FileInputStream fis = new FileInputStream(f);
-                        // BEGIN android-modified
-                        InputStream is = new BufferedInputStream(fis, 8192);
-                        // END android-modified
+                        InputStream is = new BufferedInputStream(fis);
                         netProps = new Properties();
                         netProps.load(is);
                         is.close();
diff --git a/luni/src/main/java/java/util/Formatter.java b/luni/src/main/java/java/util/Formatter.java
index d2e59e6..dec1416 100644
--- a/luni/src/main/java/java/util/Formatter.java
+++ b/luni/src/main/java/java/util/Formatter.java
@@ -776,10 +776,7 @@ public final class Formatter implements Closeable, Flushable {
         FileOutputStream fout = null;
         try {
             fout = new FileOutputStream(file);
-            OutputStreamWriter writer = new OutputStreamWriter(fout, csn);
-            // BEGIN android-changed
-            out = new BufferedWriter(writer, 8192);
-            // END android-changed
+            out = new BufferedWriter(new OutputStreamWriter(fout, csn));
         } catch (RuntimeException e) {
             closeOutputStream(fout);
             throw e;
@@ -802,11 +799,7 @@ public final class Formatter implements Closeable, Flushable {
      *            the stream to be used as the destination of the {@code Formatter}.
      */
     public Formatter(OutputStream os) {
-        OutputStreamWriter writer = new OutputStreamWriter(os, Charset
-                .defaultCharset());
-        // BEGIN android-changed
-        out = new BufferedWriter(writer, 8192);
-        // END android-changed
+        out = new BufferedWriter(new OutputStreamWriter(os, Charset.defaultCharset()));
         locale = Locale.getDefault();
     }
 
@@ -843,14 +836,8 @@ public final class Formatter implements Closeable, Flushable {
      * @throws UnsupportedEncodingException
      *             if the charset with the specified name is not supported.
      */
-    public Formatter(OutputStream os, String csn, Locale l)
-            throws UnsupportedEncodingException {
-
-        OutputStreamWriter writer = new OutputStreamWriter(os, csn);
-        // BEGIN android-changed
-        out = new BufferedWriter(writer, 8192);
-        // END android-changed
-
+    public Formatter(OutputStream os, String csn, Locale l) throws UnsupportedEncodingException {
+        out = new BufferedWriter(new OutputStreamWriter(os, csn));
         locale = l;
     }
 
diff --git a/luni/src/main/java/java/util/Properties.java b/luni/src/main/java/java/util/Properties.java
index b0f3b9d..ce42f9a 100644
--- a/luni/src/main/java/java/util/Properties.java
+++ b/luni/src/main/java/java/util/Properties.java
@@ -294,9 +294,7 @@ public class Properties extends Hashtable<Object, Object> {
         int offset = 0, keyLength = -1, intVal;
         boolean firstChar = true;
 
-        // BEGIN android-changed
-        BufferedInputStream bis = new BufferedInputStream(in, 8192);
-        // END android-changed
+        BufferedInputStream bis = new BufferedInputStream(in);
 
         while (true) {
             intVal = bis.read();
diff --git a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/FileURLConnection.java b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/FileURLConnection.java
index 7f738d3..72c078f 100644
--- a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/FileURLConnection.java
+++ b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/FileURLConnection.java
@@ -81,9 +81,7 @@ public class FileURLConnection extends URLConnection {
             is = getDirectoryListing(f);
             // use -1 for the contentLength
         } else {
-            // BEGIN android-modified
-            is = new BufferedInputStream(new FileInputStream(f), 8192);
-            // END android-modified
+            is = new BufferedInputStream(new FileInputStream(f));
             length = is.available();
         }
         connected = true;
diff --git a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/ftp/FtpURLConnection.java b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/ftp/FtpURLConnection.java
index 3f02817..3f1ac79 100644
--- a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/ftp/FtpURLConnection.java
+++ b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/ftp/FtpURLConnection.java
@@ -250,13 +250,9 @@ public class FtpURLConnection extends URLConnection {
             throw new IOException(Msg.getString("K0095")); //$NON-NLS-1$
         }
         if (getDoInput()) {
-            // BEGIN android-modified
             inputStream = new FtpURLInputStream(
-                    new BufferedInputStream(dataSocket.getInputStream(), 8192),
-                    controlSocket);
-            // END android-modified
+                    new BufferedInputStream(dataSocket.getInputStream()), controlSocket);
         }
-
     }
 
     /**