diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-11-07 22:00:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-07 22:00:10 +0000 |
| commit | 62751c9c9bb9070eb7f44981079b65cb25045ee5 (patch) | |
| tree | d3b04513e7e71c80a16a627010a46d6da063340b /include | |
| parent | 048e913d58a59055af81dfa362db2c4ccf00f75a (diff) | |
| parent | 5239bad27472b9ae42be924a98850683e5e70476 (diff) | |
| download | frameworks_av-62751c9c9bb9070eb7f44981079b65cb25045ee5.zip frameworks_av-62751c9c9bb9070eb7f44981079b65cb25045ee5.tar.gz frameworks_av-62751c9c9bb9070eb7f44981079b65cb25045ee5.tar.bz2 | |
am 5239bad2: am b177468b: Merge "Improve AudioTrack recovery from mediaserver death" into lmp-mr1-dev automerge: e662cd5
* commit '5239bad27472b9ae42be924a98850683e5e70476':
Improve AudioTrack recovery from mediaserver death
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioSystem.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index 6f46f9e..6a0f2a6 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -375,7 +375,10 @@ private: friend class AudioFlingerClient; friend class AudioPolicyServiceClient; - static Mutex gLock; + static Mutex gLock; // protects all members except gAudioPolicyService, + // gAudioPolicyServiceClient, and gAudioPortCallback + static Mutex gLockAPS; // protects gAudioPolicyService and gAudioPolicyServiceClient + static Mutex gLockAPC; // protects gAudioPortCallback static sp<IAudioFlinger> gAudioFlinger; static audio_error_callback gAudioErrorCallback; |