commit 5e21bf934b2a71b595deb9856a2044eea4dbce86
author Brian Carlstrom <bdc@google.com> Sun Sep 23 12:37:13 2012 -0700
committer Brian Carlstrom <bdc@google.com> Tue Sep 25 10:38:52 2012 -0700
tree 8b7bc73f80e90f7d8eae8e9ee99d6900f0c12551
parent b8c2ac3ecb6ee6319df65a88f42141c070b46163

Unhide SSLCertificateSocketFactory.setSoWriteTimeout

Bug: 6693087
Change-Id: I585c2a61226da58077fd7cd7826695ce17380248

api/current.txt

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 @@
     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

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 @@
      * 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 {