From c2491572d549ef47f8e52054590eaea5a16fe021 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 Change-Id: I785723aaed06054b9aa8ebff77803f23d7836db9 --- 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 c3b8f3959f..c5cb1f5b7c 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}