diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-11-07 21:23:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-07 21:23:28 +0000 |
| commit | e662cd5cdbe1312d6b74754d2945fffe99e4fe2c (patch) | |
| tree | 68e681598ebc7f78ca041a51011652700694f7d8 /include | |
| parent | 1609e451cf6101efe6aeaaa2da61db2cb095c9e8 (diff) | |
| parent | d2d089fc86c62843992e7d5b371ee9227189a1e6 (diff) | |
| download | frameworks_av-e662cd5cdbe1312d6b74754d2945fffe99e4fe2c.zip frameworks_av-e662cd5cdbe1312d6b74754d2945fffe99e4fe2c.tar.gz frameworks_av-e662cd5cdbe1312d6b74754d2945fffe99e4fe2c.tar.bz2 | |
Merge "Improve AudioTrack recovery from mediaserver death" into lmp-mr1-dev
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; |