From 2c4254e4765b4fa675c268550e66a3d4341282bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oskar=20Gr=C3=B6nqvist?= Date: Wed, 11 Dec 2013 14:14:33 +0100 Subject: 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 --- packages/SettingsProvider/res/values/defaults.xml | 4 ++++ .../src/com/android/providers/settings/DatabaseHelper.java | 3 +++ 2 files changed, 7 insertions(+) (limited to 'packages/SettingsProvider') 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 --> 0 + + + 0 + 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(); -- cgit v1.1