From 03d866a6a62492bd0abf0eaff71bdb33ec17a8f4 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Tue, 22 May 2018 10:01:53 +0900 Subject: [PATCH] Add configurable captive portal probes The probes allow testing for a configurable status code and location header (regexes). They are disabled by default, so this CL is a no-op unless the probe configurations are pushed. Bug: b/79499239 Test: tests in CL pass, manual: captive portal login works Merged-In: Iec7a74bbf2569a91e958c497200d77e8451cbf7b Merged-In: Ia958815325d1466345e9626efc8f62fc9d08d774 (clean cherry-pick of pi-dev I785723aaed06054b9aa8ebff77803f23d7836db9) Change-Id: I18b3f263fed08fa4fee20d5e88f3ec8647d7f835 --- core/java/android/net/ConnectivityManager.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 40f47b0cda..4ccfea2efa 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -237,6 +237,14 @@ public class ConnectivityManager { */ public static final String EXTRA_CAPTIVE_PORTAL_URL = "android.net.extra.CAPTIVE_PORTAL_URL"; + /** + * Key for passing a {@link android.net.captiveportal.CaptivePortalProbeSpec} to the captive + * portal login activity. + * {@hide} + */ + public static final String EXTRA_CAPTIVE_PORTAL_PROBE_SPEC = + "android.net.extra.CAPTIVE_PORTAL_PROBE_SPEC"; + /** * Key for passing a user agent string to the captive portal login activity. * {@hide}