diff options
| author | Christopher Tate <ctate@google.com> | 2014-01-22 19:02:04 -0800 |
|---|---|---|
| committer | Christopher Tate <ctate@google.com> | 2014-01-22 19:02:04 -0800 |
| commit | 91beb94c65716f78a120cff93e3bb78a190500b4 (patch) | |
| tree | 16498bd6e6f3f190ead98ea5d411fca471eca9e2 /packages/SettingsProvider | |
| parent | 052665d9720800c9f9dfc488592f1f0bce0e3a71 (diff) | |
| parent | a5bb65aaf0695c7d84045fb4e044b63170dd5790 (diff) | |
| download | frameworks_base-91beb94c65716f78a120cff93e3bb78a190500b4.zip frameworks_base-91beb94c65716f78a120cff93e3bb78a190500b4.tar.gz frameworks_base-91beb94c65716f78a120cff93e3bb78a190500b4.tar.bz2 | |
resolved conflicts for merge of a5bb65aa to master
Change-Id: Ib286d5194f68c55cfd2e5c17a5eb89ea32add574
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 28f50bc..69f7152 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -179,4 +179,8 @@ for immersive mode. Override to disable immersive mode confirmation for certain packages. --> <string name="def_immersive_mode_confirmations" translatable="false"></string> + + <!-- 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 e3a3691..f316d88 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -2275,6 +2275,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(); |