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

Merge commit '11bae14009d91c063780b2cafee2fc4fb660c08c' into kraken

* commit '11bae14009d91c063780b2cafee2fc4fb660c08c':
  Fix issue 2602879: camera shutter sound not playing.

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();