From e8b7aea6bb325af0c5ecd1e5b86d4fef8647f705 Mon Sep 17 00:00:00 2001 From: Hugo Benichi Date: Tue, 27 Sep 2016 13:01:41 +0900 Subject: [PATCH] New Settings symbols for captive portal detection This patch defines new Settings symbols for - setting the probe urls for captive portal detection. - setting which User-Agent to use for captive portal detection. The existing default values for these settings are not changed, i.e: - HTTP and HTTPS probes urls are unchanged. - the fallback probe is not used. - User-Agent is empty by default. Bug: 29367974 Change-Id: I6e4b3b172e56b8b67fffa4b51f776d68d5851f25 --- services/core/java/com/android/server/ConnectivityService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 524c3cc87c..b7dfd19627 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -5501,7 +5501,7 @@ public class ConnectivityService extends IConnectivityManager.Stub @Override public String getCaptivePortalServerUrl() { - return NetworkMonitor.getCaptivePortalServerUrl(mContext); + return NetworkMonitor.getCaptivePortalServerHttpUrl(mContext); } @Override