summaryrefslogtreecommitdiffstats
path: root/packages/SettingsProvider
diff options
context:
space:
mode:
authorRoman Birg <roman@cyngn.com>2014-08-12 18:17:45 -0700
committerSteve Kondik <steve@cyngn.com>2015-10-26 16:07:32 -0700
commitc299491a255a78bf4ad52efdf63a673c97c60f13 (patch)
tree456772917a46b286051c79c19dc31e5ac8609f3f /packages/SettingsProvider
parent445ed78ae6d9563c7343e0b949d76568c13a3c02 (diff)
downloadframeworks_base-c299491a255a78bf4ad52efdf63a673c97c60f13.zip
frameworks_base-c299491a255a78bf4ad52efdf63a673c97c60f13.tar.gz
frameworks_base-c299491a255a78bf4ad52efdf63a673c97c60f13.tar.bz2
SettingsProvider: add default overlay entry for SEND_ACTION_APP_ERROR
Add a default entry for Settings.Global.SEND_ACTION_APP_ERROR so that it can be overlayed elsewhere if needed. Change-Id: Ieffc2f4a1ad8ad0df04a9e33b575150a680478af Signed-off-by: Roman Birg <roman@cyngn.com>
Diffstat (limited to 'packages/SettingsProvider')
-rw-r--r--packages/SettingsProvider/res/values/defaults.xml3
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java3
2 files changed, 6 insertions, 0 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml
index d7128cd..eef03ad 100644
--- a/packages/SettingsProvider/res/values/defaults.xml
+++ b/packages/SettingsProvider/res/values/defaults.xml
@@ -196,6 +196,9 @@
<!-- Default for Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS -->
<bool name="def_lock_screen_allow_private_notifications">true</bool>
+ <!-- Default for Settings.Global.SEND_ACTION_APP_ERROR -->
+ <integer name="def_send_action_app_error">0</integer>
+
<!-- Default for Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED, 1==on -->
<integer name="def_heads_up_enabled">1</integer>
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index fac9507..98a0d0d 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -2715,6 +2715,9 @@ class DatabaseHelper extends SQLiteOpenHelper {
loadSetting(stmt, Settings.Global.DEVICE_NAME, getDefaultDeviceName());
+ loadIntegerSetting(stmt, Settings.Global.SEND_ACTION_APP_ERROR,
+ R.integer.def_send_action_app_error);
+
loadBooleanSetting(stmt, Settings.Global.GUEST_USER_ENABLED,
R.bool.def_guest_user_enabled);
loadSetting(stmt, Settings.Global.ENHANCED_4G_MODE_ENABLED,