Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c673bac authored by Brian Carlstrom's avatar Brian Carlstrom Committed by The Android Automerger
Browse files

Reverting public setSoWriteTimeout 

This reverts fd901f73 and 5e21bf93

Bug: 7237764
Bug: 6693087
Change-Id: I7cc9657e4df219481eb33de803081a01b13ee0f2
parent 9faab4fb

api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -12745,14 +12745,12 @@ package android.net { 
    method public static javax.net.ssl.SSLSocketFactory getDefault(int, android.net.SSLSessionCache);

    method public java.lang.String[] getDefaultCipherSuites();

    method public static org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache);

    method public static org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, int, android.net.SSLSessionCache);

    method public static javax.net.ssl.SSLSocketFactory getInsecure(int, android.net.SSLSessionCache);

    method public byte[] getNpnSelectedProtocol(java.net.Socket);

    method public java.lang.String[] getSupportedCipherSuites();

    method public void setHostname(java.net.Socket, java.lang.String);

    method public void setKeyManagers(javax.net.ssl.KeyManager[]);

    method public void setNpnProtocols(byte[][]);

    method public void setSoWriteTimeout(java.net.Socket, int) throws java.net.SocketException;

    method public void setTrustManagers(javax.net.ssl.TrustManager[]);

    method public void setUseSessionTickets(java.net.Socket, boolean);

  }

core/java/android/net/SSLCertificateSocketFactory.java

+4 −36
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { 
    private byte[] mNpnProtocols = null;



    private final int mHandshakeTimeoutMillis;

    private final int mWriteTimeoutMillis;

    private final SSLClientSessionCache mSessionCache;

    private final boolean mSecure;
@@ -101,21 +100,12 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { 
    }



    private SSLCertificateSocketFactory(

            int handshakeTimeoutMillis,

            int writeTimeoutMillis,

            SSLSessionCache cache,

            boolean secure) {

            int handshakeTimeoutMillis, SSLSessionCache cache, boolean secure) {

        mHandshakeTimeoutMillis = handshakeTimeoutMillis;

        mWriteTimeoutMillis = writeTimeoutMillis;

        mSessionCache = cache == null ? null : cache.mSessionCache;

        mSecure = secure;

    }



    private SSLCertificateSocketFactory(

            int handshakeTimeoutMillis, SSLSessionCache cache, boolean secure) {

        this(handshakeTimeoutMillis, 0, cache, secure);

    }



    /**

     * Returns a new socket factory instance with an optional handshake timeout.

     *
@@ -171,24 +161,6 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { 
                new SSLCertificateSocketFactory(handshakeTimeoutMillis, cache, true));

    }



    /**

     * Returns a socket factory (also named SSLSocketFactory, but in a different

     * namespace) for use with the Apache HTTP stack.

     *

     * @param handshakeTimeoutMillis to use for SSL connection handshake, or 0

     *         for none.  The socket timeout is reset to 0 after the handshake.

     * @param writeTimeoutMillis the desired write timeout in milliseconds or 0 for none.

     * @param cache The {@link SSLSessionCache} to use, or null for no cache.

     * @return a new SocketFactory with the specified parameters

     */

    public static org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(

            int handshakeTimeoutMillis,

            int writeTimeoutMillis,

            SSLSessionCache cache) {

        return new org.apache.http.conn.ssl.SSLSocketFactory(new SSLCertificateSocketFactory(

                handshakeTimeoutMillis, writeTimeoutMillis, cache, true));

    }



    /**

     * Verify the hostname of the certificate used by the other end of a

     * connected socket.  You MUST call this if you did not supply a hostname
@@ -376,8 +348,10 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { 
     * To take effect, this option must be set before the blocking method was called.

     *

     * @param socket a socket created by this factory.

     * @param writeTimeoutMilliseconds the desired write timeout in milliseconds.

     * @param timeout the desired write timeout in milliseconds.

     * @throws IllegalArgumentException if the socket was not created by this factory.

     *

     * @hide

     */

    public void setSoWriteTimeout(Socket socket, int writeTimeoutMilliseconds)

            throws SocketException {
@@ -404,7 +378,6 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { 
        OpenSSLSocketImpl s = (OpenSSLSocketImpl) getDelegate().createSocket(k, host, port, close);

        s.setNpnProtocols(mNpnProtocols);

        s.setHandshakeTimeout(mHandshakeTimeoutMillis);

        s.setSoWriteTimeout(mWriteTimeoutMillis);

        if (mSecure) {

            verifyHostname(s, host);

        }
@@ -424,7 +397,6 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { 
        OpenSSLSocketImpl s = (OpenSSLSocketImpl) getDelegate().createSocket();

        s.setNpnProtocols(mNpnProtocols);

        s.setHandshakeTimeout(mHandshakeTimeoutMillis);

        s.setSoWriteTimeout(mWriteTimeoutMillis);

        return s;

    }
@@ -442,7 +414,6 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { 
                addr, port, localAddr, localPort);

        s.setNpnProtocols(mNpnProtocols);

        s.setHandshakeTimeout(mHandshakeTimeoutMillis);

        s.setSoWriteTimeout(mWriteTimeoutMillis);

        return s;

    }
@@ -458,7 +429,6 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { 
        OpenSSLSocketImpl s = (OpenSSLSocketImpl) getDelegate().createSocket(addr, port);

        s.setNpnProtocols(mNpnProtocols);

        s.setHandshakeTimeout(mHandshakeTimeoutMillis);

        s.setSoWriteTimeout(mWriteTimeoutMillis);

        return s;

    }
@@ -475,7 +445,6 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { 
                host, port, localAddr, localPort);

        s.setNpnProtocols(mNpnProtocols);

        s.setHandshakeTimeout(mHandshakeTimeoutMillis);

        s.setSoWriteTimeout(mWriteTimeoutMillis);

        if (mSecure) {

            verifyHostname(s, host);

        }
@@ -493,7 +462,6 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { 
        OpenSSLSocketImpl s = (OpenSSLSocketImpl) getDelegate().createSocket(host, port);

        s.setNpnProtocols(mNpnProtocols);

        s.setHandshakeTimeout(mHandshakeTimeoutMillis);

        s.setSoWriteTimeout(mWriteTimeoutMillis);

        if (mSecure) {

            verifyHostname(s, host);

        }

core/java/android/net/http/AndroidHttpClient.java

+16 −17
Original line number Diff line number Diff line
@@ -16,16 +16,7 @@ 


package android.net.http;



import android.content.ContentResolver;

import android.content.Context;

import android.net.SSLCertificateSocketFactory;

import android.net.SSLSessionCache;

import android.os.Looper;

import android.util.Base64;

import android.util.Log;



import com.android.internal.http.HttpDateTime;



import org.apache.http.Header;

import org.apache.http.HttpEntity;

import org.apache.http.HttpEntityEnclosingRequest;
@@ -34,18 +25,18 @@ import org.apache.http.HttpHost; 
import org.apache.http.HttpRequest;

import org.apache.http.HttpRequestInterceptor;

import org.apache.http.HttpResponse;

import org.apache.http.client.ClientProtocolException;

import org.apache.http.entity.AbstractHttpEntity;

import org.apache.http.entity.ByteArrayEntity;

import org.apache.http.client.HttpClient;

import org.apache.http.client.ResponseHandler;

import org.apache.http.client.ClientProtocolException;

import org.apache.http.client.protocol.ClientContext;

import org.apache.http.client.methods.HttpUriRequest;

import org.apache.http.client.params.HttpClientParams;

import org.apache.http.client.protocol.ClientContext;

import org.apache.http.conn.ClientConnectionManager;

import org.apache.http.conn.scheme.PlainSocketFactory;

import org.apache.http.conn.scheme.Scheme;

import org.apache.http.conn.scheme.SchemeRegistry;

import org.apache.http.entity.AbstractHttpEntity;

import org.apache.http.entity.ByteArrayEntity;

import org.apache.http.impl.client.DefaultHttpClient;

import org.apache.http.impl.client.RequestWrapper;

import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
@@ -53,17 +44,25 @@ import org.apache.http.params.BasicHttpParams; 
import org.apache.http.params.HttpConnectionParams;

import org.apache.http.params.HttpParams;

import org.apache.http.params.HttpProtocolParams;

import org.apache.http.protocol.BasicHttpContext;

import org.apache.http.protocol.BasicHttpProcessor;

import org.apache.http.protocol.HttpContext;

import org.apache.http.protocol.BasicHttpContext;



import java.io.ByteArrayOutputStream;

import java.io.IOException;

import java.io.InputStream;

import java.io.ByteArrayOutputStream;

import java.io.OutputStream;

import java.net.URI;

import java.util.zip.GZIPInputStream;

import java.util.zip.GZIPOutputStream;

import java.net.URI;



import android.content.Context;

import android.content.ContentResolver;

import android.net.SSLCertificateSocketFactory;

import android.net.SSLSessionCache;

import android.os.Looper;

import android.util.Base64;

import android.util.Log;



/**

 * Implementation of the Apache {@link DefaultHttpClient} that is configured with
@@ -135,7 +134,7 @@ public final class AndroidHttpClient implements HttpClient { 
                PlainSocketFactory.getSocketFactory(), 80));

        schemeRegistry.register(new Scheme("https",

                SSLCertificateSocketFactory.getHttpSocketFactory(

                SOCKET_OPERATION_TIMEOUT, SOCKET_OPERATION_TIMEOUT, sessionCache), 443));

                SOCKET_OPERATION_TIMEOUT, sessionCache), 443));



        ClientConnectionManager manager =

                new ThreadSafeClientConnManager(params, schemeRegistry);