Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e21bf93 authored by Brian Carlstrom's avatar Brian Carlstrom
Browse files

Unhide SSLCertificateSocketFactory.setSoWriteTimeout 

Bug: 6693087
Change-Id: I585c2a61226da58077fd7cd7826695ce17380248
parent b8c2ac3e

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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);

  }

core/java/android/net/SSLCertificateSocketFactory.java

+1 −3
Original line number Diff line number Diff line
@@ -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 {