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

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

Merge "Switch the connectivity check to its own hostname." into lmp-mr1-dev

parents 1a6dd298 cd29cb66

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

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ import java.lang.reflect.Method; 


public class CaptivePortalLoginActivity extends Activity {

    private static final String TAG = "CaptivePortalLogin";

    private static final String DEFAULT_SERVER = "clients3.google.com";

    private static final String DEFAULT_SERVER = "connectivitycheck.android.com";

    private static final int SOCKET_TIMEOUT_MS = 10000;



    // Keep this in sync with NetworkMonitor.

services/core/java/com/android/server/connectivity/NetworkMonitor.java

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ import java.util.Random; 
public class NetworkMonitor extends StateMachine {

    private static final boolean DBG = true;

    private static final String TAG = "NetworkMonitor";

    private static final String DEFAULT_SERVER = "clients3.google.com";

    private static final String DEFAULT_SERVER = "connectivitycheck.android.com";

    private static final int SOCKET_TIMEOUT_MS = 10000;

    public static final String ACTION_NETWORK_CONDITIONS_MEASURED =

            "android.net.conn.NETWORK_CONDITIONS_MEASURED";