Merge "Remove Settings constants for NetworkStack" (a4527d56) · Commits · e / os / android_frameworks_base

api/system-current.txt

+0 −11

Original line number	Diff line number	Diff line
		@@ -4609,17 +4609,6 @@ package android.provider {
		method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public static boolean putString(@NonNull android.content.ContentResolver, @NonNull String, @Nullable String, @Nullable String, boolean);
		method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public static void resetToDefaults(@NonNull android.content.ContentResolver, @Nullable String);
		field public static final String AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES = "autofill_compat_mode_allowed_packages";
		field public static final String CAPTIVE_PORTAL_FALLBACK_PROBE_SPECS = "captive_portal_fallback_probe_specs";
		field public static final String CAPTIVE_PORTAL_FALLBACK_URL = "captive_portal_fallback_url";
		field public static final String CAPTIVE_PORTAL_HTTPS_URL = "captive_portal_https_url";
		field public static final String CAPTIVE_PORTAL_HTTP_URL = "captive_portal_http_url";
		field public static final String CAPTIVE_PORTAL_MODE = "captive_portal_mode";
		field public static final int CAPTIVE_PORTAL_MODE_AVOID = 2; // 0x2
		field public static final int CAPTIVE_PORTAL_MODE_IGNORE = 0; // 0x0
		field public static final int CAPTIVE_PORTAL_MODE_PROMPT = 1; // 0x1
		field public static final String CAPTIVE_PORTAL_OTHER_FALLBACK_URLS = "captive_portal_other_fallback_urls";
		field public static final String CAPTIVE_PORTAL_USER_AGENT = "captive_portal_user_agent";
		field public static final String CAPTIVE_PORTAL_USE_HTTPS = "captive_portal_use_https";
		field public static final String CARRIER_APP_NAMES = "carrier_app_names";
		field public static final String CARRIER_APP_WHITELIST = "carrier_app_whitelist";
		field public static final String DEFAULT_SM_DP_PLUS = "default_sm_dp_plus";

api/test-current.txt

+0 −11

Original line number	Diff line number	Diff line
		@@ -1201,17 +1201,6 @@ package android.provider {

		public static final class Settings.Global extends android.provider.Settings.NameValueTable {
		field public static final String AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES = "autofill_compat_mode_allowed_packages";
		field public static final String CAPTIVE_PORTAL_FALLBACK_PROBE_SPECS = "captive_portal_fallback_probe_specs";
		field public static final String CAPTIVE_PORTAL_FALLBACK_URL = "captive_portal_fallback_url";
		field public static final String CAPTIVE_PORTAL_HTTPS_URL = "captive_portal_https_url";
		field public static final String CAPTIVE_PORTAL_HTTP_URL = "captive_portal_http_url";
		field public static final String CAPTIVE_PORTAL_MODE = "captive_portal_mode";
		field public static final int CAPTIVE_PORTAL_MODE_AVOID = 2; // 0x2
		field public static final int CAPTIVE_PORTAL_MODE_IGNORE = 0; // 0x0
		field public static final int CAPTIVE_PORTAL_MODE_PROMPT = 1; // 0x1
		field public static final String CAPTIVE_PORTAL_OTHER_FALLBACK_URLS = "captive_portal_other_fallback_urls";
		field public static final String CAPTIVE_PORTAL_USER_AGENT = "captive_portal_user_agent";
		field public static final String CAPTIVE_PORTAL_USE_HTTPS = "captive_portal_use_https";
		field public static final String HIDDEN_API_BLACKLIST_EXEMPTIONS = "hidden_api_blacklist_exemptions";
		field public static final String LOCATION_GLOBAL_KILL_SWITCH = "location_global_kill_switch";
		field public static final String LOW_POWER_MODE = "low_power";

core/java/android/provider/Settings.java

+0 −22

Original line number	Diff line number	Diff line
		@@ -10336,8 +10336,6 @@ public final class Settings {
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final int CAPTIVE_PORTAL_MODE_IGNORE = 0;

		/**
		@@ -10346,8 +10344,6 @@ public final class Settings {
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final int CAPTIVE_PORTAL_MODE_PROMPT = 1;

		/**
		@@ -10356,8 +10352,6 @@ public final class Settings {
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final int CAPTIVE_PORTAL_MODE_AVOID = 2;

		/**
		@@ -10367,8 +10361,6 @@ public final class Settings {
		* The default for this setting is CAPTIVE_PORTAL_MODE_PROMPT.
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final String CAPTIVE_PORTAL_MODE = "captive_portal_mode";

		/**
		@@ -10397,8 +10389,6 @@ public final class Settings {
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final String CAPTIVE_PORTAL_HTTPS_URL = "captive_portal_https_url";

		/**
		@@ -10407,8 +10397,6 @@ public final class Settings {
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final String CAPTIVE_PORTAL_HTTP_URL = "captive_portal_http_url";

		/**
		@@ -10417,8 +10405,6 @@ public final class Settings {
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final String CAPTIVE_PORTAL_FALLBACK_URL = "captive_portal_fallback_url";

		/**
		@@ -10427,8 +10413,6 @@ public final class Settings {
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final String CAPTIVE_PORTAL_OTHER_FALLBACK_URLS =
		"captive_portal_other_fallback_urls";

		@@ -10438,8 +10422,6 @@ public final class Settings {
		* by "@@,@@".
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final String CAPTIVE_PORTAL_FALLBACK_PROBE_SPECS =
		"captive_portal_fallback_probe_specs";

		@@ -10450,8 +10432,6 @@ public final class Settings {
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final String CAPTIVE_PORTAL_USE_HTTPS = "captive_portal_use_https";

		/**
		@@ -10460,8 +10440,6 @@ public final class Settings {
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final String CAPTIVE_PORTAL_USER_AGENT = "captive_portal_user_agent";

		/**

packages/NetworkStack/src/android/net/util/NetworkStackUtils.java

+43 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,49 @@ public class NetworkStackUtils {
		*/
		public static final String CAPTIVE_PORTAL_USE_HTTPS = "captive_portal_use_https";

		/**
		* The URL used for HTTPS captive portal detection upon a new connection.
		* A 204 response code from the server is used for validation.
		*/
		public static final String CAPTIVE_PORTAL_HTTPS_URL = "captive_portal_https_url";

		/**
		* The URL used for HTTP captive portal detection upon a new connection.
		* A 204 response code from the server is used for validation.
		*/
		public static final String CAPTIVE_PORTAL_HTTP_URL = "captive_portal_http_url";

		/**
		* The URL used for fallback HTTP captive portal detection when previous HTTP
		* and HTTPS captive portal detection attemps did not return a conclusive answer.
		*/
		public static final String CAPTIVE_PORTAL_FALLBACK_URL = "captive_portal_fallback_url";

		/**
		* What to do when connecting a network that presents a captive portal.
		* Must be one of the CAPTIVE_PORTAL_MODE_* constants above.
		*
		* The default for this setting is CAPTIVE_PORTAL_MODE_PROMPT.
		*/
		public static final String CAPTIVE_PORTAL_MODE = "captive_portal_mode";

		/**
		* Don't attempt to detect captive portals.
		*/
		public static final int CAPTIVE_PORTAL_MODE_IGNORE = 0;

		/**
		* When detecting a captive portal, display a notification that
		* prompts the user to sign in.
		*/
		public static final int CAPTIVE_PORTAL_MODE_PROMPT = 1;

		/**
		* When detecting a captive portal, immediately disconnect from the
		* network and do not reconnect to that network in the future.
		*/
		public static final int CAPTIVE_PORTAL_MODE_AVOID = 2;

		static {
		System.loadLibrary("networkstackutilsjni");
		}

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

+13 −9

Original line number	Diff line number	Diff line
		@@ -44,6 +44,12 @@ import static android.net.util.DataStallUtils.DEFAULT_DATA_STALL_MIN_EVALUATE_TI
		import static android.net.util.DataStallUtils.DEFAULT_DATA_STALL_VALID_DNS_TIME_THRESHOLD_MS;
		import static android.net.util.DataStallUtils.DEFAULT_DNS_LOG_SIZE;
		import static android.net.util.NetworkStackUtils.CAPTIVE_PORTAL_FALLBACK_PROBE_SPECS;
		import static android.net.util.NetworkStackUtils.CAPTIVE_PORTAL_FALLBACK_URL;
		import static android.net.util.NetworkStackUtils.CAPTIVE_PORTAL_HTTPS_URL;
		import static android.net.util.NetworkStackUtils.CAPTIVE_PORTAL_HTTP_URL;
		import static android.net.util.NetworkStackUtils.CAPTIVE_PORTAL_MODE;
		import static android.net.util.NetworkStackUtils.CAPTIVE_PORTAL_MODE_IGNORE;
		import static android.net.util.NetworkStackUtils.CAPTIVE_PORTAL_MODE_PROMPT;
		import static android.net.util.NetworkStackUtils.CAPTIVE_PORTAL_OTHER_FALLBACK_URLS;
		import static android.net.util.NetworkStackUtils.CAPTIVE_PORTAL_USER_AGENT;
		import static android.net.util.NetworkStackUtils.CAPTIVE_PORTAL_USE_HTTPS;
		@@ -1175,10 +1181,10 @@ public class NetworkMonitor extends StateMachine {
		}

		private boolean getIsCaptivePortalCheckEnabled() {
		String symbol = Settings.Global.CAPTIVE_PORTAL_MODE;
		int defaultValue = Settings.Global.CAPTIVE_PORTAL_MODE_PROMPT;
		String symbol = CAPTIVE_PORTAL_MODE;
		int defaultValue = CAPTIVE_PORTAL_MODE_PROMPT;
		int mode = mDependencies.getSetting(mContext, symbol, defaultValue);
		return mode != Settings.Global.CAPTIVE_PORTAL_MODE_IGNORE;
		return mode != CAPTIVE_PORTAL_MODE_IGNORE;
		}

		private boolean getUseHttpsValidation() {
		@@ -1188,8 +1194,7 @@ public class NetworkMonitor extends StateMachine {

		private String getCaptivePortalServerHttpsUrl() {
		return getSettingFromResource(mContext, R.string.config_captive_portal_https_url,
		R.string.default_captive_portal_https_url,
		Settings.Global.CAPTIVE_PORTAL_HTTPS_URL);
		R.string.default_captive_portal_https_url, CAPTIVE_PORTAL_HTTPS_URL);
		}

		private int getDnsProbeTimeout() {
		@@ -1228,8 +1233,7 @@ public class NetworkMonitor extends StateMachine {
		*/
		public String getCaptivePortalServerHttpUrl() {
		return getSettingFromResource(mContext, R.string.config_captive_portal_http_url,
		R.string.default_captive_portal_http_url,
		Settings.Global.CAPTIVE_PORTAL_HTTP_URL);
		R.string.default_captive_portal_http_url, CAPTIVE_PORTAL_HTTP_URL);
		}

		private int getConsecutiveDnsTimeoutThreshold() {
		@@ -1258,8 +1262,8 @@ public class NetworkMonitor extends StateMachine {

		private URL[] makeCaptivePortalFallbackUrls() {
		try {
		final String firstUrl = mDependencies.getSetting(mContext,
		Settings.Global.CAPTIVE_PORTAL_FALLBACK_URL, null);
		final String firstUrl = mDependencies.getSetting(mContext, CAPTIVE_PORTAL_FALLBACK_URL,
		null);

		final URL[] settingProviderUrls;
		if (!TextUtils.isEmpty(firstUrl)) {