diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-01-15 00:12:18 +0100 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2015-01-15 00:12:18 +0100 |
| commit | 568e54be71731bdbcd5338385eb6cc6a082c9456 (patch) | |
| tree | 9cbbe50e8824a72d7afda5ef75a45584742e200a /packages/CaptivePortalLogin | |
| parent | 4bc5b2bce9b1e3483357966f4ef074391565255f (diff) | |
| parent | 87f536948c06e57d2f9e78f39c01272cb08de1f1 (diff) | |
| download | frameworks_base-568e54be71731bdbcd5338385eb6cc6a082c9456.zip frameworks_base-568e54be71731bdbcd5338385eb6cc6a082c9456.tar.gz frameworks_base-568e54be71731bdbcd5338385eb6cc6a082c9456.tar.bz2 | |
resolve merge conflicts of 87f5369 to master.
Change-Id: I5d1a7aaf48c4bf70f7181508aa46fbbcc2cf7086
Diffstat (limited to 'packages/CaptivePortalLogin')
| -rw-r--r-- | packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java index 06e8574..d898555 100644 --- a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java +++ b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java @@ -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. |