Merge "audiopolicy: Add synchronization to EffectDescriptorCollection"

2 files changed, 8 insertions, 0 deletions

diff --git a/services/audiopolicy/common/managerdefinitions/include/EffectDescriptor.h b/services/audiopolicy/common/managerdefinitions/include/EffectDescriptor.h
index c9783a1..396541b 100644
--- a/services/audiopolicy/common/managerdefinitions/include/EffectDescriptor.h
+++ b/services/audiopolicy/common/managerdefinitions/include/EffectDescriptor.h
@@ -21,6 +21,7 @@
 #include <utils/KeyedVector.h>
 #include <utils/RefBase.h>
 #include <utils/Errors.h>
+#include <utils/Thread.h>
 
 namespace android {
 
@@ -66,6 +67,8 @@ private:
      * Maximum memory allocated to audio effects in KB
      */
     static const uint32_t MAX_EFFECTS_MEMORY = 512;
+
+    Mutex mLock;
 };
 
 }; // namespace android
diff --git a/services/audiopolicy/common/managerdefinitions/src/EffectDescriptor.cpp b/services/audiopolicy/common/managerdefinitions/src/EffectDescriptor.cpp
index 33d838d..6a0d079 100644
--- a/services/audiopolicy/common/managerdefinitions/src/EffectDescriptor.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/EffectDescriptor.cpp
@@ -56,6 +56,7 @@ status_t EffectDescriptorCollection::registerEffect(const effect_descriptor_t *d
                                                     int session,
                                                     int id)
 {
+    Mutex::Autolock _l(mLock);
     if (mTotalEffectsMemory + desc->memoryUsage > getMaxEffectsMemory()) {
         ALOGW("registerEffect() memory limit exceeded for Fx %s, Memory %d KB",
                 desc->name, desc->memoryUsage);
@@ -80,6 +81,7 @@ status_t EffectDescriptorCollection::registerEffect(const effect_descriptor_t *d
 
 status_t EffectDescriptorCollection::unregisterEffect(int id)
 {
+    Mutex::Autolock _l(mLock);
     ssize_t index = indexOfKey(id);
     if (index < 0) {
         ALOGW("unregisterEffect() unknown effect ID %d", id);
@@ -106,6 +108,7 @@ status_t EffectDescriptorCollection::unregisterEffect(int id)
 
 status_t EffectDescriptorCollection::setEffectEnabled(int id, bool enabled)
 {
+    Mutex::Autolock _l(mLock);
     ssize_t index = indexOfKey(id);
     if (index < 0) {
         ALOGW("unregisterEffect() unknown effect ID %d", id);
@@ -148,6 +151,7 @@ status_t EffectDescriptorCollection::setEffectEnabled(const sp<EffectDescriptor>
 
 bool EffectDescriptorCollection::isNonOffloadableEffectEnabled()
 {
+    Mutex::Autolock _l(mLock);
     for (size_t i = 0; i < size(); i++) {
         sp<EffectDescriptor> effectDesc = valueAt(i);
         if (effectDesc->mEnabled && (effectDesc->mStrategy == STRATEGY_MEDIA) &&
@@ -172,6 +176,7 @@ uint32_t EffectDescriptorCollection::getMaxEffectsMemory() const
 
 status_t EffectDescriptorCollection::dump(int fd)
 {
+    Mutex::Autolock _l(mLock);
     const size_t SIZE = 256;
     char buffer[SIZE];