diff options
| author | Irfan Sheriff <isheriff@google.com> | 2013-03-06 07:57:41 -0800 |
|---|---|---|
| committer | Irfan Sheriff <isheriff@google.com> | 2013-03-14 13:55:56 -0700 |
| commit | 11aefad94de6569c4c7394e7bc5fdeb0ae60d5bb (patch) | |
| tree | 4df4926fa0f9b8bf577b182fd52078a6b0ea8eb1 /core/java | |
| parent | 1c80a05176c9a6cdef2975cc655f34588275194e (diff) | |
Add support for scan always available mode
Modify WifiService to add a controller to track the various
desired states and let the WifiStatemachine actually control
the bring up.
Bug: 8141918
Change-Id: I6e98fd5a29b43c3c50c315eff5255cd0a3eaebcd
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/provider/Settings.java | 8 | ||||
| -rw-r--r-- | core/java/com/android/internal/util/Protocol.java | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 266d0d3e1d2a..d251ca25e068 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -4784,6 +4784,13 @@ public final class Settings { public static final String WIFI_ON = "wifi_on"; /** + * Setting to allow scans to be enabled even wifi is turned off for connectivity. + * @hide + */ + public static final String WIFI_SCAN_ALWAYS_AVAILABLE = + "wifi_scan_always_enabled"; + + /** * Used to save the Wifi_ON state prior to tethering. * This state will be checked to restore Wifi after * the user turns off tethering. @@ -5345,6 +5352,7 @@ public final class Settings { WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY, WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED, + WIFI_SCAN_ALWAYS_AVAILABLE, WIFI_NUM_OPEN_NETWORKS_KEPT, EMERGENCY_TONE, CALL_AUTO_RETRY, diff --git a/core/java/com/android/internal/util/Protocol.java b/core/java/com/android/internal/util/Protocol.java index 7c2b1b56be05..91b109e94d48 100644 --- a/core/java/com/android/internal/util/Protocol.java +++ b/core/java/com/android/internal/util/Protocol.java @@ -45,6 +45,7 @@ public class Protocol { public static final int BASE_WIFI_P2P_SERVICE = 0x00023000; public static final int BASE_WIFI_MONITOR = 0x00024000; public static final int BASE_WIFI_MANAGER = 0x00025000; + public static final int BASE_WIFI_CONTROLLER = 0x00026000; public static final int BASE_DHCP = 0x00030000; public static final int BASE_DATA_CONNECTION = 0x00040000; public static final int BASE_DATA_CONNECTION_AC = 0x00041000; |