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

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

Browse Source 
* commit '8c54a8e8c7f40037ac871d27e0a800e9c271fae9':
  Change to connectivitycheck.gstatic.com
This commit is contained in:
Erik Kline
2015-07-27 05:23:23 +00:00
committed by Android Git Automerger
parent 763611dd04 8c54a8e8c7
commit f0927733a3
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 {
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 };

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