diff options
author | Brian Carlstrom <bdc@google.com> | 2012-09-23 12:25:31 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-23 12:25:31 -0700 |
commit | 5a009dcc58a46c41f1b54ccffca7d1317bbbff18 (patch) | |
tree | 181948b38b2e58662ce3494301a4aef1c3bbfeeb /core/java | |
parent | bda527eca601b27ae66b6a93819cbe934e5ec782 (diff) | |
parent | 7ab7a8b582b29d34ec0fdbd0c727e225f350bb30 (diff) | |
download | frameworks_base-5a009dcc58a46c41f1b54ccffca7d1317bbbff18.zip frameworks_base-5a009dcc58a46c41f1b54ccffca7d1317bbbff18.tar.gz frameworks_base-5a009dcc58a46c41f1b54ccffca7d1317bbbff18.tar.bz2 |
Merge "Add SSLCertificateSocketFactory.setSoWriteTimeout to allow SO_SNDTIMEO to be specified" into jb-mr1-dev
Diffstat (limited to 'core/java')
-rw-r--r-- | core/java/android/net/SSLCertificateSocketFactory.java | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/core/java/android/net/SSLCertificateSocketFactory.java b/core/java/android/net/SSLCertificateSocketFactory.java index 27cabef..846443d 100644 --- a/core/java/android/net/SSLCertificateSocketFactory.java +++ b/core/java/android/net/SSLCertificateSocketFactory.java @@ -21,6 +21,7 @@ import android.util.Log; import java.io.IOException; import java.net.InetAddress; import java.net.Socket; +import java.net.SocketException; import java.security.KeyManagementException; import java.security.cert.X509Certificate; import javax.net.SocketFactory; @@ -341,6 +342,22 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { castToOpenSSLSocket(socket).setHostname(hostName); } + /** + * Sets this socket's SO_SNDTIMEO write timeout in milliseconds. + * Use 0 for no timeout. + * To take effect, this option must be set before the blocking method was called. + * + * @param socket a socket created by this factory. + * @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 { + castToOpenSSLSocket(socket).setSoWriteTimeout(writeTimeoutMilliseconds); + } + private static OpenSSLSocketImpl castToOpenSSLSocket(Socket socket) { if (!(socket instanceof OpenSSLSocketImpl)) { throw new IllegalArgumentException("Socket not created by this factory: " |