summaryrefslogtreecommitdiffstats
path: root/packages/SettingsProvider
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2011-10-21 11:22:48 -0400
committerMike Lockwood <lockwood@google.com>2012-02-10 10:51:24 -0800
commit2395527c9bb1cdc3bcd3dfcbc8b72b90ed3e7080 (patch)
tree6f078b30e781ce6d6dede36450fc78dbcee3fa38 /packages/SettingsProvider
parent86aeb06635ef8c7f3fb1b4a935d5e8da819e2a88 (diff)
downloadframeworks_base-2395527c9bb1cdc3bcd3dfcbc8b72b90ed3e7080.zip
frameworks_base-2395527c9bb1cdc3bcd3dfcbc8b72b90ed3e7080.tar.gz
frameworks_base-2395527c9bb1cdc3bcd3dfcbc8b72b90ed3e7080.tar.bz2
SettingsProvider: Allow overridding default value for Setttings.Secure.DEVICE_PROVISIONED
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'packages/SettingsProvider')
-rw-r--r--packages/SettingsProvider/res/values/defaults.xml1
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java3
2 files changed, 4 insertions, 0 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml
index 379e180..f7713aa 100644
--- a/packages/SettingsProvider/res/values/defaults.xml
+++ b/packages/SettingsProvider/res/values/defaults.xml
@@ -71,6 +71,7 @@
<string name="def_lock_sound" translatable="false">/system/media/audio/ui/Lock.ogg</string>
<string name="def_unlock_sound" translatable="false">/system/media/audio/ui/Unlock.ogg</string>
<bool name="def_lockscreen_disabled">false</bool>
+ <bool name="def_device_provisioned">false</bool>
<!-- Notifications use ringer volume -->
<bool name="def_notifications_use_ring_volume">true</bool>
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index 8b1da1f..3ebf44b 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -1596,6 +1596,9 @@ public class DatabaseHelper extends SQLiteOpenHelper {
loadBooleanSetting(stmt, Settings.System.LOCKSCREEN_DISABLED,
R.bool.def_lockscreen_disabled);
+
+ loadBooleanSetting(stmt, Settings.Secure.DEVICE_PROVISIONED,
+ R.bool.def_device_provisioned);
} finally {
if (stmt != null) stmt.close();
}