diff options
| author | Irfan Sheriff <isheriff@google.com> | 2010-10-29 15:32:10 -0700 |
|---|---|---|
| committer | Irfan Sheriff <isheriff@google.com> | 2010-11-02 16:35:56 -0700 |
| commit | ed4f28b492da3ff140bbaabbbda798a08c40ea5b (patch) | |
| tree | 5676b10fe89f58e9c460e766532a24d2104fc62c /core/java | |
| parent | 98444a944c9126898bc4c370f831a79bb3b30bd8 (diff) | |
| download | frameworks_base-ed4f28b492da3ff140bbaabbbda798a08c40ea5b.zip frameworks_base-ed4f28b492da3ff140bbaabbbda798a08c40ea5b.tar.gz frameworks_base-ed4f28b492da3ff140bbaabbbda798a08c40ea5b.tar.bz2 | |
Set country code in the driver and remove channel set
With dual band support, using country code
settings is the way to go
Bug: 2936741
Change-Id: I760dce4c43b1af19ee205c28f0d287420c8d9e85
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/provider/Settings.java | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index ee53828..2229964 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -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, |