summaryrefslogtreecommitdiffstats
path: root/packages/SettingsProvider
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2012-09-30 18:25:05 -0700
committerJim Miller <jaggies@google.com>2012-10-01 18:14:41 -0700
commitb14288d4b13d7629f578c4854f5a14d4d9a06783 (patch)
tree72762aa30edeee5d3d0961ccd5b59c9888a96615 /packages/SettingsProvider
parent1f7a09b5df9f859781d9cfa0053fad44c72c2168 (diff)
downloadframeworks_base-b14288d4b13d7629f578c4854f5a14d4d9a06783.zip
frameworks_base-b14288d4b13d7629f578c4854f5a14d4d9a06783.tar.gz
frameworks_base-b14288d4b13d7629f578c4854f5a14d4d9a06783.tar.bz2
Attempt to fix missing lock sounds
bug 7254629 Change-Id: I65eee674fe014a0e84d5ec20ead81abdec38f890
Diffstat (limited to 'packages/SettingsProvider')
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index 06c8e11..f69c0af 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -1884,10 +1884,6 @@ public class DatabaseHelper extends SQLiteOpenHelper {
loadIntegerSetting(stmt, Settings.System.LOCKSCREEN_SOUNDS_ENABLED,
R.integer.def_lockscreen_sounds_enabled);
- loadStringSetting(stmt, Settings.System.LOCK_SOUND,
- R.string.def_lock_sound);
- loadStringSetting(stmt, Settings.System.UNLOCK_SOUND,
- R.string.def_unlock_sound);
}
private void loadDefaultAnimationSettings(SQLiteStatement stmt) {
@@ -2103,6 +2099,12 @@ public class DatabaseHelper extends SQLiteOpenHelper {
loadBooleanSetting(stmt, Settings.Global.WIFI_DISPLAY_ON,
R.bool.def_wifi_display_on);
+ loadStringSetting(stmt, Settings.Global.LOCK_SOUND,
+ R.string.def_lock_sound);
+
+ loadStringSetting(stmt, Settings.Global.UNLOCK_SOUND,
+ R.string.def_unlock_sound);
+
// --- New global settings start here
} finally {
if (stmt != null) stmt.close();