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

Commit 8e0b2a10 authored by Erik Kline's avatar Erik Kline Committed by android-build-merger
Browse files

Merge "Fix CaptivePortalLoginActivity probes to bypass Private DNS" am: ec629e2f am: 66d8d2a5 

am: 289d5298

Change-Id: Ic76d55861f385d1aecd360adda7f10142d083a47
parents 957593af 289d5298

packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -321,6 +321,7 @@ public class CaptivePortalLoginActivity extends Activity { 
        // TODO: reuse NetworkMonitor facilities for consistent captive portal detection.

        new Thread(new Runnable() {

            public void run() {

                final Network network = ResolvUtil.makeNetworkWithPrivateDnsBypass(mNetwork);

                // Give time for captive portal to open.

                try {

                    Thread.sleep(1000);
@@ -329,7 +330,7 @@ public class CaptivePortalLoginActivity extends Activity { 
                HttpURLConnection urlConnection = null;

                int httpResponseCode = 500;

                try {

                    urlConnection = (HttpURLConnection) mNetwork.openConnection(mUrl);

                    urlConnection = (HttpURLConnection) network.openConnection(mUrl);

                    urlConnection.setInstanceFollowRedirects(false);

                    urlConnection.setConnectTimeout(SOCKET_TIMEOUT_MS);

                    urlConnection.setReadTimeout(SOCKET_TIMEOUT_MS);

services/net/java/android/net/dns/ResolvUtil.java

+9 −0
Original line number Diff line number Diff line
@@ -62,4 +62,13 @@ public class ResolvUtil { 
        final long netidForResolv = NETID_USE_LOCAL_NAMESERVERS | (long) network.netId;

        return new Network((int) netidForResolv);

    }



    public static Network makeNetworkWithPrivateDnsBypass(Network network) {

        return new Network(network) {

            @Override

            public InetAddress[] getAllByName(String host) throws UnknownHostException {

                return blockingResolveAllLocally(network, host);

            }

        };

    }

}