From 634471edc409f00f38633e334cd6853954a2b093 Mon Sep 17 00:00:00 2001 From: John Spurlock Date: Thu, 9 Aug 2012 10:41:37 -0400 Subject: [PATCH] Load default Dream settings into a clean db. Set the Dream defaults during onCreate, not only onUpgrade. Bug: 6959513 Change-Id: Ia93097edaf1150813c75b6be809db9c97987868f --- .../src/com/android/providers/settings/DatabaseHelper.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 7c6ce73bd8241..4552a55d43a84 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -1697,6 +1697,13 @@ public class DatabaseHelper extends SQLiteOpenHelper { loadIntegerSetting(stmt, Settings.Secure.WIFI_MAX_DHCP_RETRY_COUNT, R.integer.def_max_dhcp_retries); + + loadBooleanSetting(stmt, Settings.Secure.SCREENSAVER_ENABLED, + R.bool.def_screensaver_enabled); + loadBooleanSetting(stmt, Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK, + R.bool.def_screensaver_activate_on_dock); + loadStringSetting(stmt, Settings.Secure.SCREENSAVER_COMPONENT, + R.string.def_screensaver_component); } finally { if (stmt != null) stmt.close(); }