From f3eae13de96feeb4ec22f636bbeb2579aad48cc9 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Tue, 22 May 2018 09:58:19 +0900 Subject: [PATCH 1/2] Move CaptivePortalProbeResult to its own file This is necessary to resolve visibility issues for the next change. Bug: b/79499239 Test: runtest frameworks-net Merged-In: Ia48b32307a51a66f2672d7112f71166dd6db41b1 Merged-In: I5df7ee9f16bc6be4f02353d40a843a383dd4cbd9 (Clean cherry-pick of pi-dev I50bc96afe6ae88c8f58a693f0a4e821f1f9b3299) Change-Id: I3c416c1a91ebfdf914fd528ff8ab73e3eb490562 --- tests/net/java/com/android/server/ConnectivityServiceTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java index e4df974278..53c62c2402 100644 --- a/tests/net/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java @@ -111,6 +111,7 @@ import android.net.NetworkUtils; import android.net.RouteInfo; import android.net.StringNetworkSpecifier; import android.net.UidRange; +import android.net.captiveportal.CaptivePortalProbeResult; import android.net.metrics.IpConnectivityLog; import android.net.util.MultinetworkPolicyTracker; import android.os.ConditionVariable; From 03d866a6a62492bd0abf0eaff71bdb33ec17a8f4 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Tue, 22 May 2018 10:01:53 +0900 Subject: [PATCH 2/2] 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}