diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-10-04 18:33:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-04 18:33:51 +0000 |
| commit | cac2fd302e844a4a46bb1749a2d2ed4739b4dc53 (patch) | |
| tree | a654005bbde664bcfbb63a70e2f120380072aac1 /core/java/android | |
| parent | 548622a26ac758f72eb0dbb16cd83aa5d51f2b2b (diff) | |
| parent | 3ea0c99b67407bb1612875762b037e50f013fd6d (diff) | |
Merge "Revert "Use a build-specific wifi country code"" into klp-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/provider/Settings.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 631a38fd0efa..989e2871b797 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2806,6 +2806,7 @@ public final class Settings { MOVED_TO_GLOBAL.add(Settings.Global.USB_MASS_STORAGE_ENABLED); MOVED_TO_GLOBAL.add(Settings.Global.USE_GOOGLE_MAIL); MOVED_TO_GLOBAL.add(Settings.Global.WEB_AUTOFILL_QUERY_URL); + MOVED_TO_GLOBAL.add(Settings.Global.WIFI_COUNTRY_CODE); MOVED_TO_GLOBAL.add(Settings.Global.WIFI_FRAMEWORK_SCAN_INTERVAL_MS); MOVED_TO_GLOBAL.add(Settings.Global.WIFI_FREQUENCY_BAND); MOVED_TO_GLOBAL.add(Settings.Global.WIFI_IDLE_MS); @@ -5230,6 +5231,12 @@ public final class Settings { "wifi_networks_available_repeat_delay"; /** + * 802.11 country code in ISO 3166 format + * @hide + */ + public static final String WIFI_COUNTRY_CODE = "wifi_country_code"; + + /** * The interval in milliseconds to issue wake up scans when wifi needs * to connect. This is necessary to connect to an access point when * device is on the move and the screen is off. |