Merge "Settings: Formalize Wifi Mainline usages" (322c2f71) · Commits · e / os / android_frameworks_base

api/system-current.txt

+9 −0

Original line number	Diff line number	Diff line
		@@ -8097,6 +8097,7 @@ package android.provider {
		public static final class Settings.Global extends android.provider.Settings.NameValueTable {
		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 AIRPLANE_MODE_TOGGLEABLE_RADIOS = "airplane_mode_toggleable_radios";
		field public static final String APP_STANDBY_ENABLED = "app_standby_enabled";
		field public static final String AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES = "autofill_compat_mode_allowed_packages";
		field public static final String CARRIER_APP_NAMES = "carrier_app_names";
		@@ -8109,13 +8110,21 @@ package android.provider {
		field public static final String EUICC_UNSUPPORTED_COUNTRIES = "euicc_unsupported_countries";
		field public static final String INSTALL_CARRIER_APP_NOTIFICATION_PERSISTENT = "install_carrier_app_notification_persistent";
		field public static final String INSTALL_CARRIER_APP_NOTIFICATION_SLEEP_MILLIS = "install_carrier_app_notification_sleep_millis";
		field public static final String NETWORK_RECOMMENDATIONS_ENABLED = "network_recommendations_enabled";
		field public static final String OTA_DISABLE_AUTOMATIC_UPDATE = "ota_disable_automatic_update";
		field public static final String REQUIRE_PASSWORD_TO_DECRYPT = "require_password_to_decrypt";
		field public static final String SOFT_AP_TIMEOUT_ENABLED = "soft_ap_timeout_enabled";
		field public static final String TETHER_OFFLOAD_DISABLED = "tether_offload_disabled";
		field public static final String TETHER_SUPPORTED = "tether_supported";
		field public static final String THEATER_MODE_ON = "theater_mode_on";
		field public static final String WEBVIEW_MULTIPROCESS = "webview_multiprocess";
		field public static final String WIFI_BADGING_THRESHOLDS = "wifi_badging_thresholds";
		field public static final String WIFI_P2P_DEVICE_NAME = "wifi_p2p_device_name";
		field public static final String WIFI_P2P_PENDING_FACTORY_RESET = "wifi_p2p_pending_factory_reset";
		field public static final String WIFI_SCAN_ALWAYS_AVAILABLE = "wifi_scan_always_enabled";
		field public static final String WIFI_SCAN_THROTTLE_ENABLED = "wifi_scan_throttle_enabled";
		field public static final String WIFI_SCORE_PARAMS = "wifi_score_params";
		field public static final String WIFI_VERBOSE_LOGGING_ENABLED = "wifi_verbose_logging_enabled";
		field public static final String WIFI_WAKEUP_ENABLED = "wifi_wakeup_enabled";
		}

core/java/android/provider/Settings.java

+10 −92

Original line number	Diff line number	Diff line
		@@ -5137,7 +5137,6 @@ public final class Settings {
		MOVED_TO_GLOBAL.add(Settings.Global.WIFI_P2P_DEVICE_NAME);
		MOVED_TO_GLOBAL.add(Settings.Global.WIFI_SAVED_STATE);
		MOVED_TO_GLOBAL.add(Settings.Global.WIFI_SUPPLICANT_SCAN_INTERVAL_MS);
		MOVED_TO_GLOBAL.add(Settings.Global.WIFI_SUSPEND_OPTIMIZATIONS_ENABLED);
		MOVED_TO_GLOBAL.add(Settings.Global.WIFI_VERBOSE_LOGGING_ENABLED);
		MOVED_TO_GLOBAL.add(Settings.Global.WIFI_ENHANCED_AUTO_JOIN);
		MOVED_TO_GLOBAL.add(Settings.Global.WIFI_NETWORK_SHOW_RSSI);
		@@ -8820,9 +8819,9 @@ public final class Settings {
		* added to both AIRPLANE_MODE_RADIOS and AIRPLANE_MODE_TOGGLEABLE_RADIOS, then Wifi
		* will be turned off when entering airplane mode, but the user will be able to reenable
		* Wifi in the Settings app.
		*
		* {@hide}
		* @hide
		*/
		@SystemApi
		public static final String AIRPLANE_MODE_TOGGLEABLE_RADIOS = "airplane_mode_toggleable_radios";

		/**
		@@ -9994,24 +9993,17 @@ public final class Settings {
		* Setting to allow scans to be enabled even wifi is turned off for connectivity.
		* @hide
		*/
		@SystemApi
		public static final String WIFI_SCAN_ALWAYS_AVAILABLE =
		"wifi_scan_always_enabled";

		/**
		* The interval in milliseconds at which wifi rtt ranging requests will be throttled when
		* they are coming from the background.
		*
		* @hide
		*/
		public static final String WIFI_RTT_BACKGROUND_EXEC_GAP_MS =
		"wifi_rtt_background_exec_gap_ms";

		/**
		* Indicate whether factory reset request is pending.
		*
		* Type: int (0 for false, 1 for true)
		* @hide
		*/
		@SystemApi
		public static final String WIFI_P2P_PENDING_FACTORY_RESET =
		"wifi_p2p_pending_factory_reset";

		@@ -10021,6 +10013,7 @@ public final class Settings {
		* Type: int (0 for false, 1 for true)
		* @hide
		*/
		@SystemApi
		public static final String SOFT_AP_TIMEOUT_ENABLED = "soft_ap_timeout_enabled";

		/**
		@@ -10064,10 +10057,10 @@ public final class Settings {
		* enabled state.
		* @hide
		*/
		@SystemApi
		public static final String NETWORK_RECOMMENDATIONS_ENABLED =
		"network_recommendations_enabled";


		/**
		* Which package name to use for network recommendations. If null, network recommendations
		* will neither be requested nor accepted.
		@@ -10091,17 +10084,6 @@ public final class Settings {
		@TestApi
		public static final String USE_OPEN_WIFI_PACKAGE = "use_open_wifi_package";

		/**
		* The number of milliseconds the {@link com.android.server.NetworkScoreService}
		* will give a recommendation request to complete before returning a default response.
		*
		* Type: long
		* @hide
		* @deprecated to be removed
		*/
		public static final String NETWORK_RECOMMENDATION_REQUEST_TIMEOUT_MS =
		"network_recommendation_request_timeout_ms";

		/**
		* The expiration time in milliseconds for the {@link android.net.WifiKey} request cache in
		* {@link com.android.server.wifi.RecommendedNetworkEvaluator}.
		@@ -10120,6 +10102,7 @@ public final class Settings {
		* Type: int (0 for false, 1 for true)
		* @hide
		*/
		@SystemApi
		public static final String WIFI_SCAN_THROTTLE_ENABLED = "wifi_scan_throttle_enabled";

		/**
		@@ -10227,19 +10210,12 @@ public final class Settings {
		public static final String WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED =
		"wifi_watchdog_poor_network_test_enabled";

		/**
		* Setting to turn on suspend optimizations at screen off on Wi-Fi. Enabled by default and
		* needs to be set to 0 to disable it.
		* @hide
		*/
		public static final String WIFI_SUSPEND_OPTIMIZATIONS_ENABLED =
		"wifi_suspend_optimizations_enabled";

		/**
		* Setting to enable verbose logging in Wi-Fi; disabled by default, and setting to 1
		* will enable it. In the future, additional values may be supported.
		* @hide
		*/
		@SystemApi
		public static final String WIFI_VERBOSE_LOGGING_ENABLED =
		"wifi_verbose_logging_enabled";

		@@ -10265,69 +10241,10 @@ public final class Settings {
		* Errors in the parameters will cause the entire setting to be ignored.
		* @hide
		*/
		@SystemApi
		public static final String WIFI_SCORE_PARAMS =
		"wifi_score_params";

		/**
		* Setting to enable logging WifiIsUnusableEvent in metrics
		* which gets triggered when wifi becomes unusable.
		* Disabled by default, and setting it to 1 will enable it.
		* @hide
		*/
		public static final String WIFI_IS_UNUSABLE_EVENT_METRICS_ENABLED =
		"wifi_is_unusable_event_metrics_enabled";

		/**
		* The minimum number of txBad the framework has to observe
		* to trigger a wifi data stall.
		* @hide
		*/
		public static final String WIFI_DATA_STALL_MIN_TX_BAD =
		"wifi_data_stall_min_tx_bad";

		/**
		* The minimum number of txSuccess the framework has to observe
		* to trigger a wifi data stall when rxSuccess is 0.
		* @hide
		*/
		public static final String WIFI_DATA_STALL_MIN_TX_SUCCESS_WITHOUT_RX =
		"wifi_data_stall_min_tx_success_without_rx";

		/**
		* Setting to enable logging Wifi LinkSpeedCounts in metrics.
		* Disabled by default, and setting it to 1 will enable it.
		* @hide
		*/
		public static final String WIFI_LINK_SPEED_METRICS_ENABLED =
		"wifi_link_speed_metrics_enabled";

		/**
		* Setting to enable the PNO frequency culling optimization.
		* Disabled by default, and setting it to 1 will enable it.
		* The value is boolean (0 or 1).
		* @hide
		*/
		public static final String WIFI_PNO_FREQUENCY_CULLING_ENABLED =
		"wifi_pno_frequency_culling_enabled";

		/**
		* Setting to enable including recency information when determining pno network priorities.
		* Disabled by default, and setting it to 1 will enable it.
		* The value is boolean (0 or 1).
		* @hide
		*/
		public static final String WIFI_PNO_RECENCY_SORTING_ENABLED =
		"wifi_pno_recency_sorting_enabled";

		/**
		* Setting to enable the Wi-Fi link probing.
		* Enabled by default, and setting it to 0 will disable it.
		* The value is boolean (0 or 1).
		* @hide
		*/
		public static final String WIFI_LINK_PROBING_ENABLED =
		"wifi_link_probing_enabled";

		/**
		* The maximum number of times we will retry a connection to an access
		* point for which we have failed in acquiring an IP address from DHCP.
		@@ -10367,6 +10284,7 @@ public final class Settings {
		* The Wi-Fi peer-to-peer device name
		* @hide
		*/
		@SystemApi
		public static final String WIFI_P2P_DEVICE_NAME = "wifi_p2p_device_name";

		/**

packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -141,9 +141,6 @@ public class GlobalSettingsValidators {
		VALIDATORS.put(Global.DEVICE_PROVISIONING_MOBILE_DATA_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.REQUIRE_PASSWORD_TO_DECRYPT, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.DEVICE_DEMO_MODE, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.WIFI_PNO_FREQUENCY_CULLING_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.WIFI_PNO_RECENCY_SORTING_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.WIFI_LINK_PROBING_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.AWARE_ALLOWED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.POWER_BUTTON_LONG_PRESS, new InclusiveIntegerRangeValidator(0, 5));
		VALIDATORS.put(

packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -1069,9 +1069,6 @@ class SettingsProtoDumpUtil {
		dumpSetting(s, p,
		Settings.Global.NETWORK_RECOMMENDATIONS_PACKAGE,
		GlobalSettingsProto.Network.RECOMMENDATIONS_PACKAGE);
		dumpSetting(s, p,
		Settings.Global.NETWORK_RECOMMENDATION_REQUEST_TIMEOUT_MS,
		GlobalSettingsProto.Network.RECOMMENDATION_REQUEST_TIMEOUT_MS);
		dumpSetting(s, p,
		Settings.Global.NETWORK_WATCHLIST_ENABLED,
		GlobalSettingsProto.Network.WATCHLIST_ENABLED);
		@@ -1586,9 +1583,6 @@ class SettingsProtoDumpUtil {
		dumpSetting(s, p,
		Settings.Global.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED,
		GlobalSettingsProto.Wifi.WATCHDOG_POOR_NETWORK_TEST_ENABLED);
		dumpSetting(s, p,
		Settings.Global.WIFI_SUSPEND_OPTIMIZATIONS_ENABLED,
		GlobalSettingsProto.Wifi.SUSPEND_OPTIMIZATIONS_ENABLED);
		dumpSetting(s, p,
		Settings.Global.WIFI_VERBOSE_LOGGING_ENABLED,
		GlobalSettingsProto.Wifi.VERBOSE_LOGGING_ENABLED);

packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java

+0 −10

Original line number	Diff line number	Diff line
		@@ -369,7 +369,6 @@ public class SettingsBackupTest {
		Settings.Global.NETWORK_WATCHLIST_LAST_REPORT_TIME,
		Settings.Global.NETWORK_PREFERENCE,
		Settings.Global.NETWORK_RECOMMENDATIONS_PACKAGE,
		Settings.Global.NETWORK_RECOMMENDATION_REQUEST_TIMEOUT_MS,
		Settings.Global.NETWORK_SCORER_APP,
		Settings.Global.NETWORK_SCORING_PROVISIONED,
		Settings.Global.NETWORK_SCORING_UI_ENABLED,
		@@ -523,8 +522,6 @@ public class SettingsBackupTest {
		Settings.Global.WIFI_BADGING_THRESHOLDS,
		Settings.Global.WIFI_BOUNCE_DELAY_OVERRIDE_MS,
		Settings.Global.WIFI_COUNTRY_CODE,
		Settings.Global.WIFI_DATA_STALL_MIN_TX_BAD,
		Settings.Global.WIFI_DATA_STALL_MIN_TX_SUCCESS_WITHOUT_RX,
		Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN,
		Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON,
		Settings.Global.WIFI_DISPLAY_ON,
		@@ -534,11 +531,6 @@ public class SettingsBackupTest {
		Settings.Global.WIFI_FRAMEWORK_SCAN_INTERVAL_MS,
		Settings.Global.WIFI_FREQUENCY_BAND,
		Settings.Global.WIFI_IDLE_MS,
		Settings.Global.WIFI_IS_UNUSABLE_EVENT_METRICS_ENABLED,
		Settings.Global.WIFI_LINK_SPEED_METRICS_ENABLED,
		Settings.Global.WIFI_PNO_FREQUENCY_CULLING_ENABLED,
		Settings.Global.WIFI_PNO_RECENCY_SORTING_ENABLED,
		Settings.Global.WIFI_LINK_PROBING_ENABLED,
		Settings.Global.WIFI_MAX_DHCP_RETRY_COUNT,
		Settings.Global.WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS,
		Settings.Global.WIFI_NETWORK_SHOW_RSSI,
		@@ -547,7 +539,6 @@ public class SettingsBackupTest {
		Settings.Global.WIFI_ON,
		Settings.Global.WIFI_P2P_DEVICE_NAME,
		Settings.Global.WIFI_P2P_PENDING_FACTORY_RESET,
		Settings.Global.WIFI_RTT_BACKGROUND_EXEC_GAP_MS,
		Settings.Global.WIFI_SAVED_STATE,
		Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE,
		Settings.Global.WIFI_SCAN_INTERVAL_WHEN_P2P_CONNECTED_MS,
		@@ -555,7 +546,6 @@ public class SettingsBackupTest {
		Settings.Global.WIFI_SCORE_PARAMS,
		Settings.Global.WIFI_SLEEP_POLICY,
		Settings.Global.WIFI_SUPPLICANT_SCAN_INTERVAL_MS,
		Settings.Global.WIFI_SUSPEND_OPTIMIZATIONS_ENABLED,
		Settings.Global.WIFI_VERBOSE_LOGGING_ENABLED,
		Settings.Global.WIFI_WATCHDOG_ON,
		Settings.Global.WIMAX_NETWORKS_AVAILABLE_NOTIFICATION_ON,