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

Commit 8c54a8e8 authored by Erik Kline's avatar Erik Kline Committed by Android Git Automerger
Browse files

am a7bdace2: Merge "Change to connectivitycheck.gstatic.com" into mnc-dev 

* commit 'a7bdace2':
  Change to connectivitycheck.gstatic.com
parents 16467c1d a7bdace2

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

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ import java.util.Random; 


public class CaptivePortalLoginActivity extends Activity {

    private static final String TAG = "CaptivePortalLogin";

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

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

    private static final int SOCKET_TIMEOUT_MS = 10000;



    private enum Result { DISMISSED, UNWANTED, WANTED_AS_IS };

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

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,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 = "connectivitycheck.android.com";

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

    private static final int SOCKET_TIMEOUT_MS = 10000;

    public static final String ACTION_NETWORK_CONDITIONS_MEASURED =

            "android.net.conn.NETWORK_CONDITIONS_MEASURED";