diff options
| author | Irfan Sheriff <isheriff@google.com> | 2010-11-08 12:24:31 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-08 12:24:31 -0800 |
| commit | 60029771d26ca3c51288c3d92cab1d3537147acd (patch) | |
| tree | c6016d37a49d9b420a571b3fb181ec0ceb867599 /core | |
| parent | cce1d2a60bc1ef10ec6beb338ec3d4cf94486c47 (diff) | |
| parent | 36f7413dabfab50699135019ba55151e9227f59d (diff) | |
| download | frameworks_base-60029771d26ca3c51288c3d92cab1d3537147acd.zip frameworks_base-60029771d26ca3c51288c3d92cab1d3537147acd.tar.gz frameworks_base-60029771d26ca3c51288c3d92cab1d3537147acd.tar.bz2 | |
Merge "add frequency band control API"
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/provider/Settings.java | 11 | ||||
| -rw-r--r-- | core/res/res/values/config.xml | 2 |
2 files changed, 13 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 9c72dec..ddfcb06 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -34,6 +34,7 @@ import android.content.res.Resources; import android.database.Cursor; import android.database.SQLException; import android.net.Uri; +import android.net.wifi.WifiManager; import android.os.BatteryManager; import android.os.Bundle; import android.os.RemoteException; @@ -2835,6 +2836,16 @@ public final class Settings { public static final String WIFI_MAX_DHCP_RETRY_COUNT = "wifi_max_dhcp_retry_count"; /** + * The operational wifi frequency band + * Set to one of {@link WifiManager#WIFI_FREQUENCY_BAND_AUTO}, + * {@link WifiManager#WIFI_FREQUENCY_BAND_5GHZ} or + * {@link WifiManager#WIFI_FREQUENCY_BAND_2GHZ} + * + * @hide + */ + public static final String WIFI_FREQUENCY_BAND = "wifi_frequency_band"; + + /** * Maximum amount of time in milliseconds to hold a wakelock while waiting for mobile * data connectivity to be established after a disconnect from Wi-Fi. */ diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index eb3cafa..ac15be6 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -162,6 +162,8 @@ note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" --> <string translatable="false" name="config_tether_apndata"></string> + <!-- Boolean indicating whether the wifi chipset has dual frequency band support --> + <bool translatable="false" name="config_wifi_dual_band_support">false</bool> <!-- Flag indicating whether the keyguard should be bypassed when the slider is open. This can be set or unset depending how easily |