Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f2c67e24: am 8bc01824: am 094efb3f: am 407f74f4: Merge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value"

Browse Source 
* commit 'f2c67e24e460e0d887bdd5167fccac9d5c54f34a':
  Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value
This commit is contained in:
Christopher Tate
2014-01-23 01:56:39 +00:00
committed by Android Git Automerger
parent 6cc8c56a14 f2c67e24e4
commit a5bb65aaf0
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SettingsProvider/res/values/defaults.xml
View File

@@ -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>

3
packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
View File

@@ -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();