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

Commit 792fd3d1 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Android Git Automerger
Browse files

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

* commit '2b52cad1':
  Switch the connectivity check to its own hostname.
parents 657f9a68 2b52cad1

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";