diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-11-07 21:55:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-07 21:55:30 +0000 |
| commit | 5239bad27472b9ae42be924a98850683e5e70476 (patch) | |
| tree | d55d73b27fe1a7c6da8d1831de4d912eca13a802 /include | |
| parent | f8d051fee37b1a0734e4142072d3053fed8df161 (diff) | |
| parent | b177468bb1647c79ba48cd0a172cf3306b31ad69 (diff) | |
| download | frameworks_av-5239bad27472b9ae42be924a98850683e5e70476.zip frameworks_av-5239bad27472b9ae42be924a98850683e5e70476.tar.gz frameworks_av-5239bad27472b9ae42be924a98850683e5e70476.tar.bz2 | |
am b177468b: Merge "Improve AudioTrack recovery from mediaserver death" into lmp-mr1-dev automerge: e662cd5
* commit 'b177468bb1647c79ba48cd0a172cf3306b31ad69':
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; |