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

21 files changed, 36 insertions, 120 deletions

diff --git a/logging/src/main/java/java/util/logging/FileHandler.java b/logging/src/main/java/java/util/logging/FileHandler.java
index dd7790e..bd02ef1 100644
--- a/logging/src/main/java/java/util/logging/FileHandler.java
+++ b/logging/src/main/java/java/util/logging/FileHandler.java
@@ -216,12 +216,8 @@ public class FileHandler extends StreamHandler {
                 break;
             }
         }
-        // BEGIN android-modified
-        output = new MeasureOutputStream(
-                new BufferedOutputStream(
-                        new FileOutputStream(fileName, append), 8192),
-                files[0].length());
-        // END android-modified
+        output = new MeasureOutputStream(new BufferedOutputStream(
+                new FileOutputStream(fileName, append)), files[0].length());
         setOutputStream(output);
     }
 
@@ -256,12 +252,8 @@ public class FileHandler extends StreamHandler {
             files[i - 1].renameTo(files[i]);
         }
         try {
-            // BEGIN android-modified
-            output = new MeasureOutputStream(
-                    new BufferedOutputStream(
-                            new FileOutputStream(files[0]),
-                            8192));
-            // END android-modified
+            output = new MeasureOutputStream(new BufferedOutputStream(
+                    new FileOutputStream(files[0])));
         } catch (FileNotFoundException e1) {
             // logging.1A=Error happened when open log file.
             this.getErrorManager().error(Messages.getString("logging.1A"), //$NON-NLS-1$
diff --git a/logging/src/main/java/java/util/logging/LogManager.java b/logging/src/main/java/java/util/logging/LogManager.java
index 6cba849..0e76b68 100644
--- a/logging/src/main/java/java/util/logging/LogManager.java
+++ b/logging/src/main/java/java/util/logging/LogManager.java
@@ -427,13 +427,11 @@ public class LogManager {
 
                 // BEGIN android-added
                 try {
-                    input = new BufferedInputStream(
-                            new FileInputStream(configFile), 8192);
+                    input = new BufferedInputStream(new FileInputStream(configFile));
                 } catch (Exception ex) {
                     // consult fixed resource as a last resort
                     input = new BufferedInputStream(
-                            getClass().getResourceAsStream(
-                                    "logging.properties"), 8192);
+                            getClass().getResourceAsStream("logging.properties"));
                 }
                 // END android-added
                 readConfiguration(input);
diff --git a/logging/src/main/java/java/util/logging/SocketHandler.java b/logging/src/main/java/java/util/logging/SocketHandler.java
index 38cfd64..0253013 100644
--- a/logging/src/main/java/java/util/logging/SocketHandler.java
+++ b/logging/src/main/java/java/util/logging/SocketHandler.java
@@ -135,10 +135,7 @@ public class SocketHandler extends StreamHandler {
                     ErrorManager.OPEN_FAILURE);
             throw e;
         }
-        // BEGIN android-modified
-        super.internalSetOutputStream(new BufferedOutputStream(this.socket
-                        .getOutputStream(), 8192));
-        // END android-modified
+        super.internalSetOutputStream(new BufferedOutputStream(this.socket.getOutputStream()));
     }
 
     /**
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);
         }
-
     }
 
     /**
diff --git a/nio/src/main/java/java/nio/channels/spi/SelectorProvider.java b/nio/src/main/java/java/nio/channels/spi/SelectorProvider.java
index b474afa..7692f2f 100644
--- a/nio/src/main/java/java/nio/channels/spi/SelectorProvider.java
+++ b/nio/src/main/java/java/nio/channels/spi/SelectorProvider.java
@@ -129,12 +129,8 @@ public abstract class SelectorProvider extends Object {
             BufferedReader br = null;
             String className = null;
             try {
-                // BEGIN android-modified
                 br = new BufferedReader(
-                        new InputStreamReader(
-                                (enumeration.nextElement()).openStream()),
-                        8192);
-                // END android-modified
+                        new InputStreamReader(enumeration.nextElement().openStream()));
             } catch (Exception e) {
                 continue;
             }
diff --git a/nio_char/src/main/java/java/nio/charset/Charset.java b/nio_char/src/main/java/java/nio/charset/Charset.java
index 724699f..db9501e 100644
--- a/nio_char/src/main/java/java/nio/charset/Charset.java
+++ b/nio_char/src/main/java/java/nio/charset/Charset.java
@@ -269,10 +269,8 @@ public abstract class Charset implements Comparable<Charset> {
         try {
             InputStream is = configFile.openStream();
             // Read each line for charset provider class names
-            // BEGIN android-modified
             reader = new BufferedReader(new InputStreamReader(is,
-                            PROVIDER_CONFIGURATION_FILE_ENCODING), 8192);
-            // END android-modified
+                    PROVIDER_CONFIGURATION_FILE_ENCODING));
             String providerClassName = reader.readLine();
             while (null != providerClassName) {
                 providerClassName = trimClassName(providerClassName);
@@ -384,10 +382,8 @@ public abstract class Charset implements Comparable<Charset> {
         try {
             InputStream is = configFile.openStream();
             // Read each line for charset provider class names
-            // BEGIN android-modified
             reader = new BufferedReader(new InputStreamReader(is,
-                            PROVIDER_CONFIGURATION_FILE_ENCODING), 8192);
-            // END android-modified
+                    PROVIDER_CONFIGURATION_FILE_ENCODING));
             String providerClassName = reader.readLine();
             while (null != providerClassName) {
                 providerClassName = trimClassName(providerClassName);
diff --git a/prefs/src/main/java/java/util/prefs/Preferences.java b/prefs/src/main/java/java/util/prefs/Preferences.java
index 8b961e4..b128858 100644
--- a/prefs/src/main/java/java/util/prefs/Preferences.java
+++ b/prefs/src/main/java/java/util/prefs/Preferences.java
@@ -194,7 +194,7 @@ public abstract class Preferences {
                         InputStream is = en.nextElement().openStream();
                         // Read each line for charset provider class names
                         reader = new BufferedReader(new InputStreamReader(is,
-                                CONFIGURATION_FILE_ENCODING), 8192);
+                                CONFIGURATION_FILE_ENCODING));
                         factoryClassName = reader.readLine();
                         commentIndex = factoryClassName.indexOf(CONFIGURATION_FILE_COMMENT);
                         if (commentIndex > 0) {
diff --git a/prefs/src/main/java/java/util/prefs/XMLParser.java b/prefs/src/main/java/java/util/prefs/XMLParser.java
index c5a234c..09dc7bc 100644
--- a/prefs/src/main/java/java/util/prefs/XMLParser.java
+++ b/prefs/src/main/java/java/util/prefs/XMLParser.java
@@ -173,9 +173,7 @@ class XMLParser {
     static void exportPrefs(Preferences prefs, OutputStream stream,
             boolean withSubTree) throws IOException, BackingStoreException {
         indent = -1;
-        // BEGIN android-modified
-        BufferedWriter out = new BufferedWriter(new OutputStreamWriter(stream, "UTF-8"), 8192); //$NON-NLS-1$
-        // END android-modified
+        BufferedWriter out = new BufferedWriter(new OutputStreamWriter(stream, "UTF-8"));
         out.write(HEADER);
         out.newLine();
         out.newLine();
@@ -515,9 +513,7 @@ class XMLParser {
             FileLock lock = null;
             try {
                 FileInputStream istream = new FileInputStream(file);
-                // BEGIN android-modified
-                in = new BufferedInputStream(istream, 8192);
-                // END android-modified
+                in = new BufferedInputStream(istream);
                 FileChannel channel = istream.getChannel();
                 lock = channel.lock(0L, Long.MAX_VALUE, true);
                 Document doc = builder.parse(in);
@@ -570,9 +566,7 @@ class XMLParser {
         FileLock lock = null;
         try {
             FileOutputStream ostream = new FileOutputStream(file);
-            // BEGIN android-modified
-            out = new BufferedWriter(new OutputStreamWriter(ostream, "UTF-8"), 8192); //$NON-NLS-1$
-            // END android-modified
+            out = new BufferedWriter(new OutputStreamWriter(ostream, "UTF-8"));
             FileChannel channel = ostream.getChannel();
             lock = channel.lock();
             out.write(HEADER);
diff --git a/security/src/main/java/java/security/Security.java b/security/src/main/java/java/security/Security.java
index 6ff38ad..1fea1bd 100644
--- a/security/src/main/java/java/security/Security.java
+++ b/security/src/main/java/java/security/Security.java
@@ -70,8 +70,7 @@ public final class Security {
                 try {
                     InputStream configStream =
                         getClass().getResourceAsStream("security.properties"); //$NON-NLS-1$
-                    InputStream input =
-                        new BufferedInputStream(configStream, 8192);
+                    InputStream input = new BufferedInputStream(configStream);
                     secprops.load(input);
                     loaded = true;
                     configStream.close();
diff --git a/security/src/main/java/org/apache/harmony/security/fortress/DefaultPolicyParser.java b/security/src/main/java/org/apache/harmony/security/fortress/DefaultPolicyParser.java
index c809fe4..8edb0c5 100644
--- a/security/src/main/java/org/apache/harmony/security/fortress/DefaultPolicyParser.java
+++ b/security/src/main/java/org/apache/harmony/security/fortress/DefaultPolicyParser.java
@@ -115,14 +115,11 @@ public class DefaultPolicyParser {
             throws Exception {
 
         boolean resolve = PolicyUtils.canExpandProperties();
-        // BEGIN android-modified
         Reader r =
             new BufferedReader(
                     new InputStreamReader(
                             AccessController.doPrivileged(
-                                    new PolicyUtils.URLLoader(location))),
-                    8192);
-        // END android-modified
+                                    new PolicyUtils.URLLoader(location))));
 
         Collection<GrantEntry> grantEntries = new HashSet<GrantEntry>();
         List<KeystoreEntry> keystores = new ArrayList<KeystoreEntry>();
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JDKPKCS12KeyStore.java b/security/src/main/java/org/bouncycastle/jce/provider/JDKPKCS12KeyStore.java
index 7846530..3cf05b1 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/JDKPKCS12KeyStore.java
+++ b/security/src/main/java/org/bouncycastle/jce/provider/JDKPKCS12KeyStore.java
@@ -704,9 +704,7 @@ public class JDKPKCS12KeyStore
             throw new NullPointerException("No password supplied for PKCS#12 KeyStore.");
         }
 
-        // BEGIN android-modified
-        BufferedInputStream             bufIn = new BufferedInputStream(stream, 8192);
-        // END android-modified
+        BufferedInputStream             bufIn = new BufferedInputStream(stream);
 
         bufIn.mark(10);
 
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JDKX509CertificateFactory.java b/security/src/main/java/org/bouncycastle/jce/provider/JDKX509CertificateFactory.java
index 899cdd0..31507c6 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/JDKX509CertificateFactory.java
+++ b/security/src/main/java/org/bouncycastle/jce/provider/JDKX509CertificateFactory.java
@@ -282,9 +282,7 @@ public class JDKX509CertificateFactory
             
             if (!in.markSupported())
             {
-                // BEGIN android-modified
-                in = new BufferedInputStream(in, 8192);
-                // END android-modified
+                in = new BufferedInputStream(in);
             }
             
             in.mark(10);
@@ -377,9 +375,7 @@ public class JDKX509CertificateFactory
             
             if (!inStream.markSupported())
             {
-                // BEGIN android-modified
-                inStream = new BufferedInputStream(inStream, 8192);
-                // END android-modified
+                inStream = new BufferedInputStream(inStream);
             }
             
             inStream.mark(10);
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/PKIXCertPath.java b/security/src/main/java/org/bouncycastle/jce/provider/PKIXCertPath.java
index 25053c3..69585b8 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/PKIXCertPath.java
+++ b/security/src/main/java/org/bouncycastle/jce/provider/PKIXCertPath.java
@@ -202,9 +202,7 @@ public  class PKIXCertPath
             }
             else if (encoding.equalsIgnoreCase("PKCS7") || encoding.equalsIgnoreCase("PEM"))
             {
-                // BEGIN android-modified
-                inStream = new BufferedInputStream(inStream, 8192);
-                // END android-modified
+                inStream = new BufferedInputStream(inStream);
                 certificates = new ArrayList();
                 CertificateFactory certFactory= CertificateFactory.getInstance("X.509", "BC");
                 Certificate cert;
diff --git a/xml/src/main/java/org/xml/sax/helpers/XMLReaderFactory.java b/xml/src/main/java/org/xml/sax/helpers/XMLReaderFactory.java
index 96151a1..b761c34 100644
--- a/xml/src/main/java/org/xml/sax/helpers/XMLReaderFactory.java
+++ b/xml/src/main/java/org/xml/sax/helpers/XMLReaderFactory.java
@@ -124,10 +124,7 @@ final public class XMLReaderFactory
             in = loader.getResourceAsStream (service);
 
         if (in != null) {
-            // BEGIN android-modified
-            reader = new BufferedReader (
-                new InputStreamReader (in, "UTF8"), 8192);
-            // END android-modified
+            reader = new BufferedReader (new InputStreamReader (in, "UTF8"));
             className = reader.readLine ();
             in.close ();
         }