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

Merge "Change network validation probe default configs" into nyc-mr1-dev

Browse Source
This commit is contained in:
Hugo Benichi
2016-09-29 01:07:35 +00:00
committed by Android (Google) Code Review
parent 3fc76c4669 11ae28f387
commit 8ae3abd0eb
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,13 +82,16 @@ public class NetworkMonitor extends StateMachine {
private static final String TAG = NetworkMonitor.class.getSimpleName(); private static final String TAG = NetworkMonitor.class.getSimpleName();
private static final boolean DBG = false; private static final boolean DBG = false;
// Default urls for captive portal detection probes // Default configuration values for captive portal detection probes.
private static final String DEFAULT_HTTPS_URL = // TODO: append a random length parameter to the default HTTPS url.
"https://connectivitycheck.gstatic.com/generate_204"; // TODO: randomize browser version ids in the default User-Agent String.
private static final String DEFAULT_HTTPS_URL = "https://www.google.com/generate_204";
private static final String DEFAULT_HTTP_URL = private static final String DEFAULT_HTTP_URL =
"http://connectivitycheck.gstatic.com/generate_204"; "http://connectivitycheck.gstatic.com/generate_204";
private static final String DEFAULT_FALLBACK_URL = null; private static final String DEFAULT_FALLBACK_URL = "http://www.google.com/gen_204";
private static final String DEFAULT_USER_AGENT = null; private static final String DEFAULT_USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64) "
+ "AppleWebKit/537.36 (KHTML, like Gecko) "
+ "Chrome/52.0.2743.82 Safari/537.36";
private static final int SOCKET_TIMEOUT_MS = 10000; private static final int SOCKET_TIMEOUT_MS = 10000;
private static final int PROBE_TIMEOUT_MS = 3000; private static final int PROBE_TIMEOUT_MS = 3000;