From 0d288a7301dfc455e3b2adfab3ccd14b9f32db6e Mon Sep 17 00:00:00 2001 From: harvey186 Date: Mon, 8 Jan 2024 09:34:38 +0100 Subject: [PATCH] captivePortal Change-Id: I1332aa2dd68c60f7aecadba996813ffc46373dab --- service/src/com/android/server/ConnectivityService.java | 2 +- .../hostside/app/src/com/android/cts/net/hostside/VpnTest.java | 2 +- tests/cts/net/src/android/net/cts/BatteryStatsManagerTest.java | 2 +- tests/unit/java/com/android/server/ConnectivityServiceTest.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java index 120486c1df..e6ed530355 100755 --- a/service/src/com/android/server/ConnectivityService.java +++ b/service/src/com/android/server/ConnectivityService.java @@ -370,7 +370,7 @@ public class ConnectivityService extends IConnectivityManager.Stub * (preferably via runtime resource overlays). */ private static final String DEFAULT_CAPTIVE_PORTAL_HTTP_URL = - "http://connectivitycheck.gstatic.com/generate_204"; + "http://captiveportal.kuketz.de/generate_204"; // TODO: create better separation between radio types and network types diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/VpnTest.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/VpnTest.java index c28ee64506..8d90242525 100755 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/VpnTest.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/VpnTest.java @@ -203,7 +203,7 @@ public class VpnTest { public static String TAG = "VpnTest"; public static int TIMEOUT_MS = 3 * 1000; public static int SOCKET_TIMEOUT_MS = 100; - public static String TEST_HOST = "connectivitycheck.gstatic.com"; + public static String TEST_HOST = "captiveportal.kuketz.de"; private static final String AUTOMATIC_ON_OFF_KEEPALIVE_VERSION = "automatic_on_off_keepalive_version"; diff --git a/tests/cts/net/src/android/net/cts/BatteryStatsManagerTest.java b/tests/cts/net/src/android/net/cts/BatteryStatsManagerTest.java index 3c71c90574..d4158795eb 100644 --- a/tests/cts/net/src/android/net/cts/BatteryStatsManagerTest.java +++ b/tests/cts/net/src/android/net/cts/BatteryStatsManagerTest.java @@ -69,7 +69,7 @@ public class BatteryStatsManagerTest{ @Rule public final DevSdkIgnoreRule ignoreRule = new DevSdkIgnoreRule(); private static final String TAG = BatteryStatsManagerTest.class.getSimpleName(); - private static final String TEST_URL = "https://connectivitycheck.gstatic.com/generate_204"; + private static final String TEST_URL = "https://captiveportal.kuketz.de/generate_204"; // This value should be the same as BatteryStatsManager.BATTERY_STATUS_DISCHARGING. // TODO: Use the constant once it's available in all branches private static final int BATTERY_STATUS_DISCHARGING = 3; diff --git a/tests/unit/java/com/android/server/ConnectivityServiceTest.java b/tests/unit/java/com/android/server/ConnectivityServiceTest.java index a5cbb4c972..58a1873c40 100755 --- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java @@ -7298,7 +7298,7 @@ public class ConnectivityServiceTest { @Test public void testGetCaptivePortalServerUrl() throws Exception { String url = mCm.getCaptivePortalServerUrl(); - assertEquals("http://connectivitycheck.gstatic.com/generate_204", url); + assertEquals("http://captiveportal.kuketz.de/generate_204", url); } private static class TestNetworkPinner extends NetworkPinner { -- 2.34.1