Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '3891c4cc918e8062abb97c542a8625d556dccc59' into froyo-plus-aosp

* commit '3891c4cc918e8062abb97c542a8625d556dccc59':
  Fix issue 2602879: camera shutter sound not playing.
This commit is contained in:
Eric Laurent
2010-04-20 10:18:07 -07:00
committed by Android Git Automerger
parent 3cd1f9f98b 3891c4cc91
commit 11bae14009
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/java/android/media/AudioService.java
View File

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