Merge "Update default value of probe url to be a constant" into rvc-dev am:... (40b0e2eb) · Commits · e / os / android_packages_modules_NetworkStack

res/values-mcc460/config.xml

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -5,7 +5,19 @@
	general case as this could degrade the user experience (portals not detected properly).		general case as this could degrade the user experience (portals not detected properly).
	However in China the default URLs are not accessible in general. The below alternatives		However in China the default URLs are not accessible in general. The below alternatives
	should allow users to connect to local networks normally. -->		should allow users to connect to local networks normally. -->
			<!-- default_captive_portal_https_url is not configured as overlayable so
			OEMs that wish to change captive_portal_https_url configuration must
			do so via configuring runtime resource overlay to
			config_captive_portal_https_url and NOT by changing or overlaying
			this resource. It will break if the enforcement of overlayable starts.
			-->
	<string name="default_captive_portal_https_url" translatable="false">https://connectivitycheck.gstatic.com/generate_204</string>		<string name="default_captive_portal_https_url" translatable="false">https://connectivitycheck.gstatic.com/generate_204</string>
			<!-- default_captive_portal_fallback_urls is not configured as overlayable
			so OEMs that wish to change captive_portal_fallback_urls configuration
			must do so via configuring runtime resource overlay to
			config_captive_portal_fallback_urls and NOT by changing or overlaying
			this resource. It will break if the enforcement of overlayable starts.
			-->
	<string-array name="default_captive_portal_fallback_urls" translatable="false">		<string-array name="default_captive_portal_fallback_urls" translatable="false">
	<item>http://www.googleapis.cn/generate_204</item>		<item>http://www.googleapis.cn/generate_204</item>
	</string-array>		</string-array>

res/values/config.xml

+18 −12

Original line number	Original line	Diff line number	Diff line
	@@ -6,28 +6,34 @@
	The overlays must apply to the config_* values, not the default_* values. The default_*		The overlays must apply to the config_* values, not the default_* values. The default_*
	values are meant to be the default when no other configuration is specified.		values are meant to be the default when no other configuration is specified.
	-->		-->

	<!-- DNS probe timeout for network validation. Enough for 3 DNS queries 5 seconds apart. -->
	<integer name="default_captive_portal_dns_probe_timeout">12500</integer>

	<!-- HTTP URL for network validation, to use for detecting captive portals. -->		<!-- HTTP URL for network validation, to use for detecting captive portals. -->
			<!-- default_captive_portal_http_url is not configured as overlayable so
			OEMs that wish to change captive_portal_http_url configuration must
			do so via configuring runtime resource overlay to
			config_captive_portal_http_url and NOT by changing or overlaying
			this resource. It will break if the enforcement of overlayable starts.
			-->
	<string name="default_captive_portal_http_url" translatable="false">http://connectivitycheck.gstatic.com/generate_204</string>		<string name="default_captive_portal_http_url" translatable="false">http://connectivitycheck.gstatic.com/generate_204</string>

	<!-- HTTPS URL for network validation, to use for confirming internet connectivity. -->		<!-- HTTPS URL for network validation, to use for confirming internet connectivity. -->
			<!-- default_captive_portal_https_url is not configured as overlayable so
			OEMs that wish to change captive_portal_https_url configuration must
			do so via configuring runtime resource overlay to
			config_captive_portal_https_url and NOT by changing or overlaying
			this resource. It will break if the enforcement of overlayable starts.
			-->
	<string name="default_captive_portal_https_url" translatable="false">https://www.google.com/generate_204</string>		<string name="default_captive_portal_https_url" translatable="false">https://www.google.com/generate_204</string>

	<!-- List of fallback URLs to use for detecting captive portals. -->		<!-- List of fallback URLs to use for detecting captive portals. -->
			<!-- default_captive_portal_fallback_urls is not configured as overlayable
			so OEMs that wish to change captive_portal_fallback_urls configuration
			must do so via configuring runtime resource overlay to
			config_captive_portal_fallback_urls and NOT by changing or overlaying
			this resource. It will break if the enforcement of overlayable starts.
			-->
	<string-array name="default_captive_portal_fallback_urls" translatable="false">		<string-array name="default_captive_portal_fallback_urls" translatable="false">
	<item>http://www.google.com/gen_204</item>		<item>http://www.google.com/gen_204</item>
	<item>http://play.googleapis.com/generate_204</item>		<item>http://play.googleapis.com/generate_204</item>
	</string-array>		</string-array>

	<!-- List of fallback probe specs to use for detecting captive portals.
	This is an alternative to fallback URLs that provides more flexibility on detection rules.
	Empty, so unused by default. -->
	<string-array name="default_captive_portal_fallback_probe_specs" translatable="false">
	</string-array>

	<!-- Configuration hooks for the above settings.		<!-- Configuration hooks for the above settings.
	Empty by default but may be overridden by RROs. -->		Empty by default but may be overridden by RROs. -->
	<integer name="config_captive_portal_dns_probe_timeout"></integer>		<integer name="config_captive_portal_dns_probe_timeout"></integer>

src/android/net/util/NetworkStackUtils.java

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -154,17 +154,31 @@ public class NetworkStackUtils {
	*/		*/
	public static final int CAPTIVE_PORTAL_MODE_AVOID = 2;		public static final int CAPTIVE_PORTAL_MODE_AVOID = 2;

			/**
			* DNS probe timeout for network validation. Enough for 3 DNS queries 5 seconds apart.
			*/
			public static final int DEFAULT_CAPTIVE_PORTAL_DNS_PROBE_TIMEOUT = 12500;

			/**
			* List of fallback probe specs to use for detecting captive portals. This is an alternative to
			* fallback URLs that provides more flexibility on detection rules. Empty, so unused by default.
			*/
			public static final String[] DEFAULT_CAPTIVE_PORTAL_FALLBACK_PROBE_SPECS =
			new String[] {};

	/**		/**
	* The default list of HTTP URLs to use for detecting captive portals.		* The default list of HTTP URLs to use for detecting captive portals.
	*/		*/
	public static final String[] DEFAULT_CAPTIVE_PORTAL_HTTP_URLS =		public static final String[] DEFAULT_CAPTIVE_PORTAL_HTTP_URLS =
	new String [] {"http://connectivitycheck.gstatic.com/generate_204"};		new String [] {"http://connectivitycheck.gstatic.com/generate_204"};

	/**		/**
	* The default list of HTTPS URLs for network validation, to use for confirming internet		* The default list of HTTPS URLs for network validation, to use for confirming internet
	* connectivity.		* connectivity.
	*/		*/
	public static final String[] DEFAULT_CAPTIVE_PORTAL_HTTPS_URLS =		public static final String[] DEFAULT_CAPTIVE_PORTAL_HTTPS_URLS =
	new String [] {"https://www.google.com/generate_204"};		new String [] {"https://www.google.com/generate_204"};

	/**		/**
	* @deprecated Considering boolean experiment flag is likely to cause misconfiguration		* @deprecated Considering boolean experiment flag is likely to cause misconfiguration
	* particularly when NetworkStack module rolls back to previous version. It's		* particularly when NetworkStack module rolls back to previous version. It's

src/com/android/server/connectivity/NetworkMonitor.java

+27 −20

tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java

+27 −6

Original line number	Original line	Diff line number	Diff line
	@@ -42,6 +42,7 @@ import static android.net.util.DataStallUtils.DATA_STALL_EVALUATION_TYPE_TCP;
	import static android.net.util.NetworkStackUtils.CAPTIVE_PORTAL_FALLBACK_PROBE_SPECS;		import static android.net.util.NetworkStackUtils.CAPTIVE_PORTAL_FALLBACK_PROBE_SPECS;
	import static android.net.util.NetworkStackUtils.CAPTIVE_PORTAL_OTHER_FALLBACK_URLS;		import static android.net.util.NetworkStackUtils.CAPTIVE_PORTAL_OTHER_FALLBACK_URLS;
	import static android.net.util.NetworkStackUtils.CAPTIVE_PORTAL_USE_HTTPS;		import static android.net.util.NetworkStackUtils.CAPTIVE_PORTAL_USE_HTTPS;
			import static android.net.util.NetworkStackUtils.DEFAULT_CAPTIVE_PORTAL_DNS_PROBE_TIMEOUT;
	import static android.net.util.NetworkStackUtils.DISMISS_PORTAL_IN_VALIDATED_NETWORK;		import static android.net.util.NetworkStackUtils.DISMISS_PORTAL_IN_VALIDATED_NETWORK;
	import static android.net.util.NetworkStackUtils.DNS_PROBE_PRIVATE_IP_NO_INTERNET_VERSION;		import static android.net.util.NetworkStackUtils.DNS_PROBE_PRIVATE_IP_NO_INTERNET_VERSION;
	import static android.net.util.NetworkStackUtils.TEST_CAPTIVE_PORTAL_HTTPS_URL;		import static android.net.util.NetworkStackUtils.TEST_CAPTIVE_PORTAL_HTTPS_URL;
	@@ -801,6 +802,28 @@ public class NetworkMonitorTest {
	R.integer.config_max_matches_http_content_length, 0));		R.integer.config_max_matches_http_content_length, 0));
	}		}

			@Test
			public void testGetHttpProbeUrl() {
			final WrappedNetworkMonitor wnm = makeNotMeteredNetworkMonitor();
			// If config_captive_portal_http_url is set and the global setting is set, the config is
			// used.
			doReturn(TEST_HTTP_URL).when(mResources).getString(R.string.config_captive_portal_http_url);
			doReturn(TEST_HTTP_OTHER_URL2).when(mResources).getString(
			R.string.default_captive_portal_http_url);
			when(mDependencies.getSetting(any(), eq(Settings.Global.CAPTIVE_PORTAL_HTTP_URL), any()))
			.thenReturn(TEST_HTTP_OTHER_URL1);
			assertEquals(TEST_HTTP_URL, wnm.getCaptivePortalServerHttpUrl());
			// If config_captive_portal_http_url is unset and the global setting is set, the global
			// setting is used.
			doReturn(null).when(mResources).getString(R.string.config_captive_portal_http_url);
			assertEquals(TEST_HTTP_OTHER_URL1, wnm.getCaptivePortalServerHttpUrl());
			// If both config_captive_portal_http_url and global setting are unset,
			// default_captive_portal_http_url is used.
			when(mDependencies.getSetting(any(), eq(Settings.Global.CAPTIVE_PORTAL_HTTP_URL), any()))
			.thenReturn(null);
			assertEquals(TEST_HTTP_OTHER_URL2, wnm.getCaptivePortalServerHttpUrl());
			}

	@Test		@Test
	public void testGetLocationMcc() throws Exception {		public void testGetLocationMcc() throws Exception {
	final WrappedNetworkMonitor wnm = makeNotMeteredNetworkMonitor();		final WrappedNetworkMonitor wnm = makeNotMeteredNetworkMonitor();
	@@ -951,12 +974,10 @@ public class NetworkMonitorTest {
	}).when(mDependencies).getDeviceConfigPropertyInt(any(),		}).when(mDependencies).getDeviceConfigPropertyInt(any(),
	eq(NetworkMonitor.CONFIG_CAPTIVE_PORTAL_DNS_PROBE_TIMEOUT),		eq(NetworkMonitor.CONFIG_CAPTIVE_PORTAL_DNS_PROBE_TIMEOUT),
	anyInt());		anyInt());
	when(mResources.getInteger(eq(R.integer.default_captive_portal_dns_probe_timeout)))		assertEquals(DEFAULT_CAPTIVE_PORTAL_DNS_PROBE_TIMEOUT, wnm.getIntSetting(mContext,
	.thenReturn(42);
	assertEquals(42, wnm.getIntSetting(mContext,
	R.integer.config_captive_portal_dns_probe_timeout,		R.integer.config_captive_portal_dns_probe_timeout,
	NetworkMonitor.CONFIG_CAPTIVE_PORTAL_DNS_PROBE_TIMEOUT,		NetworkMonitor.CONFIG_CAPTIVE_PORTAL_DNS_PROBE_TIMEOUT,
	R.integer.default_captive_portal_dns_probe_timeout));		DEFAULT_CAPTIVE_PORTAL_DNS_PROBE_TIMEOUT));

	// Set device config. Expect to get device config.		// Set device config. Expect to get device config.
	when(mDependencies.getDeviceConfigPropertyInt(any(),		when(mDependencies.getDeviceConfigPropertyInt(any(),
	@@ -965,7 +986,7 @@ public class NetworkMonitorTest {
	assertEquals(1234, wnm.getIntSetting(mContext,		assertEquals(1234, wnm.getIntSetting(mContext,
	R.integer.config_captive_portal_dns_probe_timeout,		R.integer.config_captive_portal_dns_probe_timeout,
	NetworkMonitor.CONFIG_CAPTIVE_PORTAL_DNS_PROBE_TIMEOUT,		NetworkMonitor.CONFIG_CAPTIVE_PORTAL_DNS_PROBE_TIMEOUT,
	R.integer.default_captive_portal_dns_probe_timeout));		DEFAULT_CAPTIVE_PORTAL_DNS_PROBE_TIMEOUT));

	// Set config resource. Expect to get config resource.		// Set config resource. Expect to get config resource.
	when(mResources.getInteger(eq(R.integer.config_captive_portal_dns_probe_timeout)))		when(mResources.getInteger(eq(R.integer.config_captive_portal_dns_probe_timeout)))
	@@ -973,7 +994,7 @@ public class NetworkMonitorTest {
	assertEquals(5678, wnm.getIntSetting(mContext,		assertEquals(5678, wnm.getIntSetting(mContext,
	R.integer.config_captive_portal_dns_probe_timeout,		R.integer.config_captive_portal_dns_probe_timeout,
	NetworkMonitor.CONFIG_CAPTIVE_PORTAL_DNS_PROBE_TIMEOUT,		NetworkMonitor.CONFIG_CAPTIVE_PORTAL_DNS_PROBE_TIMEOUT,
	R.integer.default_captive_portal_dns_probe_timeout));		DEFAULT_CAPTIVE_PORTAL_DNS_PROBE_TIMEOUT));
	}		}

	@Test		@Test

Original line number	Original line	Diff line number	Diff line
	@@ -67,6 +67,8 @@ import static android.net.util.NetworkStackUtils.CAPTIVE_PORTAL_OTHER_HTTPS_URLS
	import static android.net.util.NetworkStackUtils.CAPTIVE_PORTAL_OTHER_HTTP_URLS;		import static android.net.util.NetworkStackUtils.CAPTIVE_PORTAL_OTHER_HTTP_URLS;
	import static android.net.util.NetworkStackUtils.CAPTIVE_PORTAL_USER_AGENT;		import static android.net.util.NetworkStackUtils.CAPTIVE_PORTAL_USER_AGENT;
	import static android.net.util.NetworkStackUtils.CAPTIVE_PORTAL_USE_HTTPS;		import static android.net.util.NetworkStackUtils.CAPTIVE_PORTAL_USE_HTTPS;
			import static android.net.util.NetworkStackUtils.DEFAULT_CAPTIVE_PORTAL_DNS_PROBE_TIMEOUT;
			import static android.net.util.NetworkStackUtils.DEFAULT_CAPTIVE_PORTAL_FALLBACK_PROBE_SPECS;
	import static android.net.util.NetworkStackUtils.DEFAULT_CAPTIVE_PORTAL_HTTPS_URLS;		import static android.net.util.NetworkStackUtils.DEFAULT_CAPTIVE_PORTAL_HTTPS_URLS;
	import static android.net.util.NetworkStackUtils.DEFAULT_CAPTIVE_PORTAL_HTTP_URLS;		import static android.net.util.NetworkStackUtils.DEFAULT_CAPTIVE_PORTAL_HTTP_URLS;
	import static android.net.util.NetworkStackUtils.DISMISS_PORTAL_IN_VALIDATED_NETWORK;		import static android.net.util.NetworkStackUtils.DISMISS_PORTAL_IN_VALIDATED_NETWORK;
	@@ -1801,8 +1803,9 @@ public class NetworkMonitor extends StateMachine {
	final String testUrl = getTestUrl(TEST_CAPTIVE_PORTAL_HTTPS_URL);		final String testUrl = getTestUrl(TEST_CAPTIVE_PORTAL_HTTPS_URL);
	if (isValidTestUrl(testUrl)) return testUrl;		if (isValidTestUrl(testUrl)) return testUrl;
	final Context targetContext = getCustomizedContextOrDefault();		final Context targetContext = getCustomizedContextOrDefault();
	return getSettingFromResource(targetContext, R.string.config_captive_portal_https_url,		return getSettingFromResource(targetContext,
	R.string.default_captive_portal_https_url, CAPTIVE_PORTAL_HTTPS_URL);		R.string.config_captive_portal_https_url, CAPTIVE_PORTAL_HTTPS_URL,
			targetContext.getResources().getString(R.string.default_captive_portal_https_url));
	}		}

	private static boolean isValidTestUrl(@Nullable String url) {		private static boolean isValidTestUrl(@Nullable String url) {
	@@ -1819,14 +1822,13 @@ public class NetworkMonitor extends StateMachine {

	private int getDnsProbeTimeout() {		private int getDnsProbeTimeout() {
	return getIntSetting(mContext, R.integer.config_captive_portal_dns_probe_timeout,		return getIntSetting(mContext, R.integer.config_captive_portal_dns_probe_timeout,
	CONFIG_CAPTIVE_PORTAL_DNS_PROBE_TIMEOUT,		CONFIG_CAPTIVE_PORTAL_DNS_PROBE_TIMEOUT, DEFAULT_CAPTIVE_PORTAL_DNS_PROBE_TIMEOUT);
	R.integer.default_captive_portal_dns_probe_timeout);
	}		}

	/**		/**
	* Gets an integer setting from resources or device config		* Gets an integer setting from resources or device config
	*		*
	* configResource is used if set, followed by device config if set, followed by defaultResource.		* configResource is used if set, followed by device config if set, followed by defaultValue.
	* If none of these are set then an exception is thrown.		* If none of these are set then an exception is thrown.
	*		*
	* TODO: move to a common location such as a ConfigUtils class.		* TODO: move to a common location such as a ConfigUtils class.
	@@ -1834,13 +1836,13 @@ public class NetworkMonitor extends StateMachine {
	*/		*/
	@VisibleForTesting		@VisibleForTesting
	int getIntSetting(@NonNull final Context context, @StringRes int configResource,		int getIntSetting(@NonNull final Context context, @StringRes int configResource,
	@NonNull String symbol, @StringRes int defaultResource) {		@NonNull String symbol, int defaultValue) {
	final Resources res = context.getResources();		final Resources res = context.getResources();