Merge changes from topics "link-probe-overlay", "link-probe-feature-flag"

* changes:
  Link Probing: Add overlay flag to disable feature by default
  Link Probing: Add feature flag
This commit is contained in:
David Su
2019-01-30 20:50:24 +00:00
committed by Android (Google) Code Review
4 changed files with 18 additions and 0 deletions

View File

@@ -10600,6 +10600,18 @@ public final class Settings {
private static final Validator WIFI_PNO_RECENCY_SORTING_ENABLED_VALIDATOR =
BOOLEAN_VALIDATOR;
/**
* Setting to enable the Wi-Fi link probing.
* Disabled by default, and setting it to 1 will enable it.
* The value is boolean (0 or 1).
* @hide
*/
public static final String WIFI_LINK_PROBING_ENABLED =
"wifi_link_probing_enabled";
private static final Validator WIFI_LINK_PROBING_ENABLED_VALIDATOR =
BOOLEAN_VALIDATOR;
/**
* 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.
@@ -13393,6 +13405,7 @@ public final class Settings {
WIFI_PNO_FREQUENCY_CULLING_ENABLED_VALIDATOR);
VALIDATORS.put(WIFI_PNO_RECENCY_SORTING_ENABLED,
WIFI_PNO_RECENCY_SORTING_ENABLED_VALIDATOR);
VALIDATORS.put(WIFI_LINK_PROBING_ENABLED, WIFI_LINK_PROBING_ENABLED_VALIDATOR);
}
/**

View File

@@ -712,6 +712,9 @@
<!-- Indicates that connected MAC randomization is supported on this device -->
<bool translatable="false" name="config_wifi_connected_mac_randomization_supported">false</bool>
<!-- Indicates that wifi link probing is supported on this device -->
<bool translatable="false" name="config_wifi_link_probing_supported">false</bool>
<!-- Flag indicating whether we should enable the automatic brightness.
Software implementation will be used if config_hardware_auto_brightness_available is not set -->
<bool name="config_automatic_brightness_available">false</bool>

View File

@@ -1910,6 +1910,7 @@
<java-symbol type="bool" name="config_wifi_convert_apband_5ghz_to_any" />
<java-symbol type="bool" name="config_wifi_local_only_hotspot_5ghz" />
<java-symbol type="bool" name="config_wifi_connected_mac_randomization_supported" />
<java-symbol type="bool" name="config_wifi_link_probing_supported" />
<java-symbol type="bool" name="config_wifi_fast_bss_transition_enabled" />
<java-symbol type="bool" name="config_wimaxEnabled" />
<java-symbol type="bool" name="show_ongoing_ime_switcher" />

View File

@@ -525,6 +525,7 @@ public class SettingsBackupTest {
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,