summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorvandwalle <vandwalle@google.com>2014-03-31 19:12:07 -0700
committervandwalle <vandwalle@google.com>2014-05-07 18:48:48 -0700
commit7c3606c103e95d3991267cca2592402a68779caf (patch)
treed0a7e48c3342e75fa2fe8176fd4a86e1826649af /core/java
parent15560a84dfd55452f53575cc1aab71b0b8baeb65 (diff)
initial Best Network Selection implementation
-add dhcpserver, defaultGwMAC address, linked configuration and user choices link lists to WiFiconfiguration -add default gateway mac address to RouteInfo -add a Date to the ScanResult -add BSSID date to the WifiConfiguration - make framework auto-join into a config option - add Settings option for showing RSSI in Wifi picker view; add auto-join specific status to WifiConfiguration Change-Id: I5cfc4f2a48c9f3bc9766e8e68e24eff7b57f2821 Changes to be committed: modified: core/java/android/provider/Settings.java modified: wifi/java/android/net/wifi/ScanResult.java modified: wifi/java/android/net/wifi/WifiConfiguration.java
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/provider/Settings.java18
1 files changed, 17 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index d5a3bcb77893..e0ac60b85b47 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2838,6 +2838,8 @@ public final class Settings {
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_ENHANCED_AUTO_JOIN);
+ MOVED_TO_GLOBAL.add(Settings.Global.WIFI_NETWORK_SHOW_RSSI);
MOVED_TO_GLOBAL.add(Settings.Global.WIFI_WATCHDOG_ON);
MOVED_TO_GLOBAL.add(Settings.Global.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED);
MOVED_TO_GLOBAL.add(Settings.Global.WIMAX_NETWORKS_AVAILABLE_NOTIFICATION_ON);
@@ -5469,7 +5471,21 @@ public final class Settings {
public static final String WIFI_SUPPLICANT_SCAN_INTERVAL_MS =
"wifi_supplicant_scan_interval_ms";
- /**
+ /**
+ * whether frameworks handles wifi auto-join
+ * @hide
+ */
+ public static final String WIFI_ENHANCED_AUTO_JOIN =
+ "wifi_enhanced_auto_join";
+
+ /**
+ * whether settings show RSSI
+ * @hide
+ */
+ public static final String WIFI_NETWORK_SHOW_RSSI =
+ "wifi_network_show_rssi";
+
+ /**
* The interval in milliseconds to scan at supplicant when p2p is connected
* @hide
*/