diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/net/SSLCertificateSocketFactory.java | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index 14ad113..57fedce 100644 --- a/api/current.txt +++ b/api/current.txt @@ -12750,6 +12750,7 @@ package android.net { 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); } diff --git a/core/java/android/net/SSLCertificateSocketFactory.java b/core/java/android/net/SSLCertificateSocketFactory.java index 846443d..543f6a1 100644 --- a/core/java/android/net/SSLCertificateSocketFactory.java +++ b/core/java/android/net/SSLCertificateSocketFactory.java @@ -348,10 +348,8 @@ 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 timeout the desired write timeout in milliseconds. + * @param writeTimeoutMilliseconds 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 { |