am 5b550c9e: am 11bae140: am 3891c4cc: Fix issue 2602879: camera shutter sound not playing.

2010-04-20 10:31:43 -07:00
parent 467f25a779 5b550c9efc
commit 7dc9bcea53
1 changed files with 6 additions and 0 deletions
--- a/media/java/android/media/AudioService.java
+++ b/media/java/android/media/AudioService.java
@@ -279,6 +279,12 @@ public class AudioService extends IAudioService.Stub {
        mMode = AudioSystem.MODE_INVALID;
        setMode(AudioSystem.MODE_NORMAL, null);
        mMediaServerOk = true;
+
+        // Call setRingerModeInt() to apply correct mute
+        // state on streams affected by ringer mode.
+        mRingerModeMutedStreams = 0;
+        setRingerModeInt(getRingerMode(), false);
+
        AudioSystem.setErrorCallback(mAudioSystemCallback);
        loadSoundEffects();