Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5e21bf93: Unhide SSLCertificateSocketFactory.setSoWriteTimeout

Browse Source 
* commit '5e21bf934b2a71b595deb9856a2044eea4dbce86':
  Unhide SSLCertificateSocketFactory.setSoWriteTimeout
This commit is contained in:
Brian Carlstrom
2012-09-25 12:32:07 -07:00
committed by Android Git Automerger
parent ea1d555511 5e21bf934b
commit df44266daa
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -12750,6 +12750,7 @@ package android.net {
method public void setHostname(java.net.Socket, java.lang.String); method public void setHostname(java.net.Socket, java.lang.String);
method public void setKeyManagers(javax.net.ssl.KeyManager[]); method public void setKeyManagers(javax.net.ssl.KeyManager[]);
method public void setNpnProtocols(byte[][]); 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 setTrustManagers(javax.net.ssl.TrustManager[]);
method public void setUseSessionTickets(java.net.Socket, boolean); method public void setUseSessionTickets(java.net.Socket, boolean);
} }

4
core/java/android/net/SSLCertificateSocketFactory.java
View File

@@ -348,10 +348,8 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory {
* To take effect, this option must be set before the blocking method was called. * To take effect, this option must be set before the blocking method was called.
* *
* @param socket a socket created by this factory. * @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. * @throws IllegalArgumentException if the socket was not created by this factory.
*
* @hide
*/ */
public void setSoWriteTimeout(Socket socket, int writeTimeoutMilliseconds) public void setSoWriteTimeout(Socket socket, int writeTimeoutMilliseconds)
throws SocketException { throws SocketException {