3 files changed, 10 insertions, 4 deletions
diff --git a/services/audiopolicy/service/AudioPolicyEffects.cpp b/services/audiopolicy/service/AudioPolicyEffects.cpp
index 282ddeb..e71d7a5 100644
--- a/services/audiopolicy/service/AudioPolicyEffects.cpp
+++ b/services/audiopolicy/service/AudioPolicyEffects.cpp
@@ -442,6 +442,7 @@ effect_param_t *AudioPolicyEffects::loadEffectParameter(cnode *root)
     size_t curSize = sizeof(effect_param_t);
     size_t totSize = sizeof(effect_param_t) + 2 * sizeof(int);
     effect_param_t *fx_param = (effect_param_t *)malloc(totSize);
+    CHECK(fx_param != NULL);
 
     param = config_find(root, PARAM_TAG);
     value = config_find(root, VALUE_TAG);
diff --git a/services/audiopolicy/service/AudioPolicyEffects.h b/services/audiopolicy/service/AudioPolicyEffects.h
index 3dec437..3845050 100644
--- a/services/audiopolicy/service/AudioPolicyEffects.h
+++ b/services/audiopolicy/service/AudioPolicyEffects.h
@@ -27,6 +27,8 @@
 #include <utils/Vector.h>
 #include <utils/SortedVector.h>
 
+#include <media/stagefright/foundation/ADebug.h>
+
 namespace android {
 
 // ----------------------------------------------------------------------------
@@ -102,6 +104,7 @@ private:
                                                   ((origParam->psize + 3) & ~3) +
                                                   ((origParam->vsize + 3) & ~3);
                                 effect_param_t *dupParam = (effect_param_t *) malloc(origSize);
+                                CHECK(dupParam != NULL);
                                 memcpy(dupParam, origParam, origSize);
                                 // This works because the param buffer allocation is also done by
                                 // multiples of 4 bytes originally. In theory we should memcpy only
diff --git a/services/audiopolicy/service/AudioPolicyService.cpp b/services/audiopolicy/service/AudioPolicyService.cpp
index c77cc45..41dd40c 100644
--- a/services/audiopolicy/service/AudioPolicyService.cpp
+++ b/services/audiopolicy/service/AudioPolicyService.cpp
@@ -899,10 +899,12 @@ void AudioPolicyService::AudioCommandThread::insertCommand_l(sp<AudioCommand>& c
             } else {
                 data2->mKeyValuePairs = param2.toString();
             }
-            command->mTime = command2->mTime;
-            // force delayMs to non 0 so that code below does not request to wait for
-            // command status as the command is now delayed
-            delayMs = 1;
+            if (!data2->mKeyValuePairs.compare(data->mKeyValuePairs)) {
+                command->mTime = command2->mTime;
+                // force delayMs to non 0 so that code below does not request to wait for
+                // command status as the command is now delayed
+                delayMs = 1;
+            }
         } break;
 
         case SET_VOLUME: {