Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Erik Kline
2015-07-27 02:35:09 +00:00
committed by Android (Google) Code Review
parent 8be305dd65 e7d0179df5
commit a7bdace262
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
View File

@@ -56,7 +56,7 @@ import java.util.Random;
public class CaptivePortalLoginActivity extends Activity { public class CaptivePortalLoginActivity extends Activity {
private static final String TAG = "CaptivePortalLogin"; 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 static final int SOCKET_TIMEOUT_MS = 10000;
private enum Result { DISMISSED, UNWANTED, WANTED_AS_IS }; private enum Result { DISMISSED, UNWANTED, WANTED_AS_IS };

2
services/core/java/com/android/server/connectivity/NetworkMonitor.java
View File

@@ -77,7 +77,7 @@ import java.util.Random;
public class NetworkMonitor extends StateMachine { public class NetworkMonitor extends StateMachine {
private static final boolean DBG = true; private static final boolean DBG = true;
private static final String TAG = "NetworkMonitor"; 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; private static final int SOCKET_TIMEOUT_MS = 10000;
public static final String ACTION_NETWORK_CONDITIONS_MEASURED = public static final String ACTION_NETWORK_CONDITIONS_MEASURED =
"android.net.conn.NETWORK_CONDITIONS_MEASURED"; "android.net.conn.NETWORK_CONDITIONS_MEASURED";