Attempt to fix missing lock sounds
bug 7254629
Change-Id: I65eee674fe014a0e84d5ec20ead81abdec38f890
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 @@
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 @@
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();
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java
index 212a6bb..ab90baf 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java
@@ -482,19 +482,19 @@
mScreenOn = mPM.isScreenOn();
mLockSounds = new SoundPool(1, AudioManager.STREAM_SYSTEM, 0);
- String soundPath = Settings.System.getString(cr, Settings.System.LOCK_SOUND);
+ String soundPath = Settings.Global.getString(cr, Settings.Global.LOCK_SOUND);
if (soundPath != null) {
mLockSoundId = mLockSounds.load(soundPath, 1);
}
if (soundPath == null || mLockSoundId == 0) {
- if (DEBUG) Log.d(TAG, "failed to load sound from " + soundPath);
+ Log.w(TAG, "failed to load lock sound from " + soundPath);
}
- soundPath = Settings.System.getString(cr, Settings.System.UNLOCK_SOUND);
+ soundPath = Settings.Global.getString(cr, Settings.Global.UNLOCK_SOUND);
if (soundPath != null) {
mUnlockSoundId = mLockSounds.load(soundPath, 1);
}
if (soundPath == null || mUnlockSoundId == 0) {
- if (DEBUG) Log.d(TAG, "failed to load sound from " + soundPath);
+ Log.w(TAG, "failed to load unlock sound from " + soundPath);
}
int lockSoundDefaultAttenuation = context.getResources().getInteger(
com.android.internal.R.integer.config_lockSoundVolumeDb);