diff options
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/metrics/ValidationProbeEvent.java | 16 | ||||
| -rwxr-xr-x | core/java/android/provider/Settings.java | 9 |
2 files changed, 22 insertions, 3 deletions
diff --git a/core/java/android/net/metrics/ValidationProbeEvent.java b/core/java/android/net/metrics/ValidationProbeEvent.java index 5c8ea65a7c7a..751c35f8a144 100644 --- a/core/java/android/net/metrics/ValidationProbeEvent.java +++ b/core/java/android/net/metrics/ValidationProbeEvent.java @@ -29,8 +29,13 @@ import com.android.internal.util.MessageUtils; @SystemApi public final class ValidationProbeEvent extends IpConnectivityEvent implements Parcelable { - public static final int PROBE_HTTP = 0; - public static final int PROBE_HTTPS = 1; + public static final int PROBE_DNS = 0; + public static final int PROBE_HTTP = 1; + public static final int PROBE_HTTPS = 2; + public static final int PROBE_PAC = 3; + + public static final int DNS_FAILURE = 0; + public static final int DNS_SUCCESS = 1; public final int netId; public final long durationMs; @@ -73,6 +78,11 @@ public final class ValidationProbeEvent extends IpConnectivityEvent implements P } }; + /** @hide */ + public static String getProbeName(int probeType) { + return Decoder.constants.get(probeType, "PROBE_???"); + } + public static void logEvent(int netId, long durationMs, int probeType, int returnCode) { logEvent(new ValidationProbeEvent(netId, durationMs, probeType, returnCode)); } @@ -80,7 +90,7 @@ public final class ValidationProbeEvent extends IpConnectivityEvent implements P @Override public String toString() { return String.format("ValidationProbeEvent(%d, %s:%d, %dms)", - netId, Decoder.constants.get(probeType), returnCode, durationMs); + netId, getProbeName(probeType), returnCode, durationMs); } final static class Decoder { diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 2394531ad0a3..b1bf355363e3 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -7706,6 +7706,15 @@ public final class Settings { public static final String CAPTIVE_PORTAL_SERVER = "captive_portal_server"; /** + * Whether to use HTTPS for network validation. This is enabled by default and the setting + * needs to be set to 0 to disable it. This setting is a misnomer because captive portals + * don't actually use HTTPS, but it's consistent with the other settings. + * + * @hide + */ + public static final String CAPTIVE_PORTAL_USE_HTTPS = "captive_portal_use_https"; + + /** * Whether network service discovery is enabled. * * @hide |