commit a40c84eae0ce7745cecf692e6f4607ded33eba64
author Hugo Benichi <hugobenichi@google.com> Thu Sep 29 01:13:59 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 29 01:13:59 2016 +0000
tree e87d7a6a3028e81dd275c160619fb756d2e0a08a
parent d5680ac91200f4b311513243d74fa6a50a89d378
parent a3d1962ab35fca683485faf625da185c4943f8f0

Captive portal detection uses 3rd fallback probe
am: a3d1962ab3

Change-Id: I15607fbfae9dc127b72b6f299b69d6b648117338

services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java

diff --git a/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java b/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java
index 24243a0..b6ec49f 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 @@
 
         @Override
         protected CaptivePortalProbeResult isCaptivePortal() {
-            return new CaptivePortalProbeResult(gen204ProbeResult, gen204ProbeRedirectUrl);
+            return new CaptivePortalProbeResult(gen204ProbeResult, gen204ProbeRedirectUrl, null);
         }
     }