Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Set country code in the driver and remove channel set"

Browse Source
This commit is contained in:
Irfan Sheriff
2010-11-03 12:23:01 -07:00
committed by Android (Google) Code Review
parent 732c590ad6 ed4f28b492
commit 1997eebd62
11 changed files with 112 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/provider/Settings.java
View File

@@ -1199,12 +1199,6 @@ public final class Settings {
*/
public static final String WIFI_STATIC_DNS2 = "wifi_static_dns2";
/**
* The number of radio channels that are allowed in the local
* 802.11 regulatory domain.
* @hide
*/
public static final String WIFI_NUM_ALLOWED_CHANNELS = "wifi_num_allowed_channels";
/**
* Determines whether remote devices may discover and/or connect to
@@ -2701,11 +2695,11 @@ public final class Settings {
"wifi_networks_available_repeat_delay";
/**
* The number of radio channels that are allowed in the local
* 802.11 regulatory domain.
* 802.11 country code in ISO 3166 format
* @hide
*/
public static final String WIFI_NUM_ALLOWED_CHANNELS = "wifi_num_allowed_channels";
public static final String WIFI_COUNTRY_CODE = "wifi_country_code";
/**
* When the number of open networks exceeds this number, the
@@ -3638,7 +3632,7 @@ public final class Settings {
TTS_ENABLED_PLUGINS,
WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON,
WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY,
WIFI_NUM_ALLOWED_CHANNELS,
WIFI_COUNTRY_CODE,
WIFI_NUM_OPEN_NETWORKS_KEPT,
MOUNT_PLAY_NOTIFICATION_SND,
MOUNT_UMS_AUTOSTART,