From 6767b7a40a6d1db4ec65515c723a052abf3eb378 Mon Sep 17 00:00:00 2001 From: Hugo Benichi Date: Tue, 27 Sep 2016 09:22:35 +0900 Subject: [PATCH] Captive portal detection uses 3rd fallback probe This patch adds the possitibility to send a 3rd fallback validation probe in sendParallelHttpProbes when neither the 1st http probe nor the https probe came back with a conclusive answer. This 3rd probe is only used for trying again captive portal detection and does not return success, so that network validation always fails if the https probe fails. In addition, the url reveals a captive portal is now sent to the CaptivePortalLoginActivity so that all three probes can use different urls. Bug: 29367974 Change-Id: I7385fde1aa1316d94aac350af0e956cb193aa4ee --- .../src/com/android/server/ConnectivityServiceTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java b/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java index 24243a09de..b6ec49fbae 100644 --- a/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java @@ -596,7 +596,7 @@ public class ConnectivityServiceTest extends AndroidTestCase { @Override protected CaptivePortalProbeResult isCaptivePortal() { - return new CaptivePortalProbeResult(gen204ProbeResult, gen204ProbeRedirectUrl); + return new CaptivePortalProbeResult(gen204ProbeResult, gen204ProbeRedirectUrl, null); } }