am bbda5ce4: Merge "AudioSystem: Add mutex for output cache" into lmp-mr1-dev

* commit 'bbda5ce4782b20f3ed75482e5f73b8d999223438':
  AudioSystem: Add mutex for output cache

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;