diff options
| author | Erik Kline <ek@google.com> | 2015-07-20 23:37:15 +0900 |
|---|---|---|
| committer | Erik Kline <ek@google.com> | 2015-07-20 23:40:01 +0900 |
| commit | e7d0179df53326a24c5b23812ea5d90a26c2d0a1 (patch) | |
| tree | 67c45e7e38217f76bea8eb85906dba8415f3ffd1 | |
| parent | 29cf9aea5490c42b85aaaa98b6784daff82629f8 (diff) | |
| download | frameworks_base-e7d0179df53326a24c5b23812ea5d90a26c2d0a1.zip frameworks_base-e7d0179df53326a24c5b23812ea5d90a26c2d0a1.tar.gz frameworks_base-e7d0179df53326a24c5b23812ea5d90a26c2d0a1.tar.bz2 | |
Change to connectivitycheck.gstatic.com
Bug: 18869302
Bug: 22368233
Change-Id: Iaecb59e4ef13a0fa82a0a4a920689804d24044c8
| -rw-r--r-- | packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/connectivity/NetworkMonitor.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java index a489f94..0fe5509 100644 --- a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java +++ b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java @@ -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 }; diff --git a/services/core/java/com/android/server/connectivity/NetworkMonitor.java b/services/core/java/com/android/server/connectivity/NetworkMonitor.java index 2633939..952ba08 100644 --- a/services/core/java/com/android/server/connectivity/NetworkMonitor.java +++ b/services/core/java/com/android/server/connectivity/NetworkMonitor.java @@ -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"; |
