Merge 9f7a7ab02313d90f82adeb903593a670c0e1f8ea on remote branch
Change-Id: I09f105b50023ab9826573155b98d140003783d6e
diff --git a/audio-effects/post_proc/bundle.c b/audio-effects/post_proc/bundle.c
index 471e14e..5bc5ac2 100644
--- a/audio-effects/post_proc/bundle.c
+++ b/audio-effects/post_proc/bundle.c
@@ -707,7 +707,8 @@
}
if (pCmdData == NULL || cmdSize != 2 * sizeof(uint32_t) ||
replySize == NULL || *replySize < 2*sizeof(int32_t)) {
- return -EINVAL;
+ status = -EINVAL;
+ goto exit;
}
memcpy(pReplyData, pCmdData, sizeof(int32_t)*2);
} break;
@@ -751,7 +752,8 @@
cmdSize, pCmdData, *replySize, pReplyData);
if (cmdSize != sizeof(uint32_t) || pCmdData == NULL
|| pReplyData == NULL || *replySize != sizeof(int)) {
- return -EINVAL;
+ status = -EINVAL;
+ goto exit;
}
uint32_t value = *(uint32_t *)pCmdData;
if (context->ops.set_hw_acc_mode)
diff --git a/configs/parrot/parrot.mk b/configs/parrot/parrot.mk
index 14283a1..747799f 100644
--- a/configs/parrot/parrot.mk
+++ b/configs/parrot/parrot.mk
@@ -322,9 +322,6 @@
##fluencetype can be "fluence" or "fluencepro" or "none"
PRODUCT_PROPERTY_OVERRIDES += \
ro.qc.sdk.audio.fluencetype=none\
-persist.audio.fluence.voicecall=true\
-persist.audio.fluence.voicerec=false\
-persist.audio.fluence.speaker=true
##speaker protection v3 switch and ADSP AFE API version
PRODUCT_PROPERTY_OVERRIDES += \
@@ -459,10 +456,6 @@
PRODUCT_PROPERTY_OVERRIDES += \
vendor.audio.volume.headset.gain.depcal=true
-#enable dualmic fluence for voice communication
-PRODUCT_PROPERTY_OVERRIDES += \
-persist.audio.fluence.voicecomm=true
-
#enable c2 based encoders/decoders as default NT decoders/encoders
PRODUCT_PROPERTY_OVERRIDES += \
vendor.audio.c2.preferred=true