diff options
| author | Oskar Grönqvist <oskar.gronqvist@sonymobile.com> | 2013-12-11 14:14:33 +0100 |
|---|---|---|
| committer | Takeshi Aimi <takeshi.aimi@sonymobile.com> | 2014-01-14 17:57:21 +0900 |
| commit | 2c4254e4765b4fa675c268550e66a3d4341282bc (patch) | |
| tree | d82c9d52d66903ceafa31b130e7a4f85b57119b2 /packages/SettingsProvider | |
| parent | 90cadb35156829ff1d6b7066409596da38fc70e1 (diff) | |
| download | frameworks_base-2c4254e4765b4fa675c268550e66a3d4341282bc.zip frameworks_base-2c4254e4765b4fa675c268550e66a3d4341282bc.tar.gz frameworks_base-2c4254e4765b4fa675c268550e66a3d4341282bc.tar.bz2 | |
Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value
To be able to customize the "WiFi scan always available"
setting we need to set a default value.
Change-Id: I3673f2613ab9b6a947aed7e29d4cc876140c2180
Diffstat (limited to 'packages/SettingsProvider')
| -rw-r--r-- | packages/SettingsProvider/res/values/defaults.xml | 4 | ||||
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index a1d8f22..da3ca0f 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -173,4 +173,8 @@ 0 means no timeout; battery sounds will always play >0 is milliseconds of screen-off time after which battery sounds will not play --> <integer name="def_low_battery_sound_timeout">0</integer> + + <!-- Default for Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE --> + <integer name="def_wifi_scan_always_available">0</integer> + </resources> diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 09c21f3..ed86f42 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -2274,6 +2274,9 @@ public class DatabaseHelper extends SQLiteOpenHelper { loadIntegerSetting(stmt, Settings.Global.LOW_BATTERY_SOUND_TIMEOUT, R.integer.def_low_battery_sound_timeout); + loadIntegerSetting(stmt, Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, + R.integer.def_wifi_scan_always_available); + // --- New global settings start here } finally { if (stmt != null) stmt.close(); |