Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b550c9e authored by Eric Laurent's avatar Eric Laurent Committed by Android Git Automerger
Browse files

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

Merge commit '11bae140' into kraken

* commit '11bae140':
  Fix issue 2602879: camera shutter sound not playing.
parents e33e9db6 11bae140

media/java/android/media/AudioService.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -279,6 +279,12 @@ public class AudioService extends IAudioService.Stub { 
        mMode = AudioSystem.MODE_INVALID;

        mMode = AudioSystem.MODE_INVALID;

        setMode(AudioSystem.MODE_NORMAL, null);

        setMode(AudioSystem.MODE_NORMAL, null);

        mMediaServerOk = true;

        mMediaServerOk = true;



        // Call setRingerModeInt() to apply correct mute

        // state on streams affected by ringer mode.

        mRingerModeMutedStreams = 0;

        setRingerModeInt(getRingerMode(), false);



        AudioSystem.setErrorCallback(mAudioSystemCallback);

        AudioSystem.setErrorCallback(mAudioSystemCallback);

        loadSoundEffects();

        loadSoundEffects();