From aec967acabfdc8eb6311ee787c6ed5a3b7fa4203 Mon Sep 17 00:00:00 2001 From: Daniel Sandler Date: Sat, 20 Feb 2010 01:05:22 -0500 Subject: [PATCH] Move lockscreen sound effects to the system stream. Bug: 2458106, 2451532 Change-Id: I01869e3fd461dc24aa3157bf38aba9d2967526ec --- .../internal/policy/impl/KeyguardViewMediator.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/policy/com/android/internal/policy/impl/KeyguardViewMediator.java b/policy/com/android/internal/policy/impl/KeyguardViewMediator.java index 1a2898fda9399..526dcbc66d1c9 100644 --- a/policy/com/android/internal/policy/impl/KeyguardViewMediator.java +++ b/policy/com/android/internal/policy/impl/KeyguardViewMediator.java @@ -28,6 +28,7 @@ import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.media.AudioManager; import android.media.Ringtone; import android.media.RingtoneManager; import android.net.Uri; @@ -932,8 +933,12 @@ public class KeyguardViewMediator implements KeyguardViewCallback, final Uri soundUri = Uri.parse("file://" + soundPath); if (soundUri != null) { final Ringtone sfx = RingtoneManager.getRingtone(mContext, soundUri); - if (sfx != null) sfx.play(); - else Log.d(TAG, "playSounds: failed to load ringtone from uri: " + soundUri); + if (sfx != null) { + sfx.setStreamType(AudioManager.STREAM_SYSTEM); + sfx.play(); + } else { + Log.d(TAG, "playSounds: failed to load ringtone from uri: " + soundUri); + } } else { Log.d(TAG, "playSounds: could not parse Uri: " + soundPath); }