summaryrefslogtreecommitdiffstats
path: root/policy
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 /policy
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 'policy')
-rw-r--r--policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java8
1 files changed, 4 insertions, 4 deletions
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 @@ public class KeyguardViewMediator {
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);