Merge change Iec0c9b13 into eclair * changes: Import revised translations. DO NOT MERGE
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 @@ 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,