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

5 files changed, 6 insertions, 18 deletions

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;