diff options
author | Eric Laurent <elaurent@google.com> | 2014-11-19 18:19:16 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-19 18:19:16 +0000 |
commit | 8bfb2e8b25146b5c8acfb7f234f6d71f1528abd8 (patch) | |
tree | bde02fdf09a20dc7d8bf4db197248c34c3543c7a /include | |
parent | 05743d8f8d3a7b7a669e7ee358dc3bf133c7d8c5 (diff) | |
parent | 57426fc6486c6c2fa27f4bc6fcf3349282c3fdd7 (diff) | |
download | frameworks_av-8bfb2e8b25146b5c8acfb7f234f6d71f1528abd8.zip frameworks_av-8bfb2e8b25146b5c8acfb7f234f6d71f1528abd8.tar.gz frameworks_av-8bfb2e8b25146b5c8acfb7f234f6d71f1528abd8.tar.bz2 |
am 57426fc6: am 4fd641be: am bbda5ce4: Merge "AudioSystem: Add mutex for output cache" into lmp-mr1-dev
* commit '57426fc6486c6c2fa27f4bc6fcf3349282c3fdd7':
AudioSystem: Add mutex for output cache
Diffstat (limited to 'include')
-rw-r--r-- | include/media/AudioSystem.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index f3b7fbb..d54eca7 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -373,10 +373,11 @@ private: friend class AudioFlingerClient; friend class AudioPolicyServiceClient; - static Mutex gLock; // protects all members except gAudioPolicyService, - // gAudioPolicyServiceClient, and gAudioPortCallback - static Mutex gLockAPS; // protects gAudioPolicyService and gAudioPolicyServiceClient - static Mutex gLockAPC; // protects gAudioPortCallback + static Mutex gLock; // protects gAudioFlinger and gAudioErrorCallback, + static Mutex gLockCache; // protects gOutputs, gPrevInSamplingRate, gPrevInFormat, + // gPrevInChannelMask and gInBuffSize + static Mutex gLockAPS; // protects gAudioPolicyService and gAudioPolicyServiceClient + static Mutex gLockAPC; // protects gAudioPortCallback static sp<IAudioFlinger> gAudioFlinger; static audio_error_callback gAudioErrorCallback; |