Skip to content

Commit 5e21bf9

Browse files
committed
Unhide SSLCertificateSocketFactory.setSoWriteTimeout
Bug: 6693087 Change-Id: I585c2a61226da58077fd7cd7826695ce17380248
1 parent b8c2ac3 commit 5e21bf9

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

api/current.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12750,6 +12750,7 @@ package android.net {
1275012750
method public void setHostname(java.net.Socket, java.lang.String);
1275112751
method public void setKeyManagers(javax.net.ssl.KeyManager[]);
1275212752
method public void setNpnProtocols(byte[][]);
12753+
method public void setSoWriteTimeout(java.net.Socket, int) throws java.net.SocketException;
1275312754
method public void setTrustManagers(javax.net.ssl.TrustManager[]);
1275412755
method public void setUseSessionTickets(java.net.Socket, boolean);
1275512756
}

core/java/android/net/SSLCertificateSocketFactory.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -348,10 +348,8 @@ public void setHostname(Socket socket, String hostName) {
348348
* To take effect, this option must be set before the blocking method was called.
349349
*
350350
* @param socket a socket created by this factory.
351-
* @param timeout the desired write timeout in milliseconds.
351+
* @param writeTimeoutMilliseconds the desired write timeout in milliseconds.
352352
* @throws IllegalArgumentException if the socket was not created by this factory.
353-
*
354-
* @hide
355353
*/
356354
public void setSoWriteTimeout(Socket socket, int writeTimeoutMilliseconds)
357355
throws SocketException {

0 commit comments

Comments
 (0)