commit 8b5dcafc44a2a6cc284f2899952805c816e732f8
author Hugo Benichi <hugobenichi@google.com> Thu Sep 29 06:07:53 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 29 06:07:53 2016 +0000
tree e8e1d1cc954ccefe367af8907231ac9e7d0757c8
parent 2894388f94fa0c5250c2e72dc51f025f4957ce14
parent 82d7d36a229705b97e7a7c1d1123332abdb09fa7

Captive portal detection uses 3rd fallback probe am: 6767b7a40a am: 580194d336
am: 82d7d36a22

Change-Id: I221cf47aa43105d4094ec724f8d6f4f6c98d0757

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 340be62..257341b 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);
         }
     }