diff options
author | Daniel Sandler <dsandler@google.com> | 2010-02-20 01:05:22 -0500 |
---|---|---|
committer | Daniel Sandler <dsandler@google.com> | 2010-02-22 15:11:05 -0500 |
commit | aec967acabfdc8eb6311ee787c6ed5a3b7fa4203 (patch) | |
tree | f20710ff71e4aba62ec49aacc83e1281c87e6086 /policy | |
parent | f2d8e74c0230f53acdc6f94652961e4adb0e134a (diff) | |
download | frameworks_base-aec967acabfdc8eb6311ee787c6ed5a3b7fa4203.zip frameworks_base-aec967acabfdc8eb6311ee787c6ed5a3b7fa4203.tar.gz frameworks_base-aec967acabfdc8eb6311ee787c6ed5a3b7fa4203.tar.bz2 |
Move lockscreen sound effects to the system stream.
Bug: 2458106, 2451532
Change-Id: I01869e3fd461dc24aa3157bf38aba9d2967526ec
Diffstat (limited to 'policy')
-rw-r--r-- | policy/com/android/internal/policy/impl/KeyguardViewMediator.java | 9 |
1 files 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 1a2898f..526dcbc 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); } |