diff options
author | Eric Laurent <elaurent@google.com> | 2009-12-01 17:29:25 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-01 17:29:25 -0800 |
commit | 96dba44972a593f4e876a8297d5584434b9a0de0 (patch) | |
tree | fd006c2847c6785e0727409f3d85df95d5396824 | |
parent | fd78eb9dda3ba95d07a515959e6a560e3bb7e8e8 (diff) | |
parent | 6a6687ba35f8ec916a3988993bbe3d1b85edc5b4 (diff) | |
download | AlarmClock-96dba44972a593f4e876a8297d5584434b9a0de0.tar.gz |
am 6a6687ba: am 37a8d1bf: Fix issue 2192673: Music Pausing Even when notifications are set to silent.
Merge commit '6a6687ba35f8ec916a3988993bbe3d1b85edc5b4' into eclair-mr2-plus-aosp
* commit '6a6687ba35f8ec916a3988993bbe3d1b85edc5b4':
Fix issue 2192673: Music Pausing Even when notifications are set to silent.
-rw-r--r-- | src/com/android/alarmclock/AlarmKlaxon.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/com/android/alarmclock/AlarmKlaxon.java b/src/com/android/alarmclock/AlarmKlaxon.java index 7205db6..a8891c1 100644 --- a/src/com/android/alarmclock/AlarmKlaxon.java +++ b/src/com/android/alarmclock/AlarmKlaxon.java @@ -229,10 +229,15 @@ public class AlarmKlaxon extends Service { private void startAlarm(MediaPlayer player) throws java.io.IOException, IllegalArgumentException, IllegalStateException { - player.setAudioStreamType(AudioManager.STREAM_ALARM); - player.setLooping(true); - player.prepare(); - player.start(); + final AudioManager audioManager = (AudioManager)getSystemService(Context.AUDIO_SERVICE); + // do not play alarms if stream volume is 0 + // (typically because ringer mode is silent). + if (audioManager.getStreamVolume(AudioManager.STREAM_ALARM) != 0) { + player.setAudioStreamType(AudioManager.STREAM_ALARM); + player.setLooping(true); + player.prepare(); + player.start(); + } } private void setDataSourceFromResource(Resources resources, |