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

Commit 5c1c2980 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Android (Google) Code Review
Browse files

Merge "Fix IPv6->IPv4 fallback for HTTPS."

parents 761c3e67 79ae3708

core/java/android/net/http/HttpsConnection.java

+2 −4
Original line number Diff line number Diff line
@@ -289,11 +289,9 @@ public class HttpsConnection extends Connection { 
        } else {

            // if we do not have a proxy, we simply connect to the host

            try {

                sslSock = (SSLSocket) getSocketFactory().createSocket();



                sslSock = (SSLSocket) getSocketFactory().createSocket(

                        mHost.getHostName(), mHost.getPort());

                sslSock.setSoTimeout(SOCKET_TIMEOUT);

                sslSock.connect(new InetSocketAddress(mHost.getHostName(),

                        mHost.getPort()));

            } catch(IOException e) {

                if (sslSock != null) {

                    sslSock.close();