commit 680ae443c5e4b95afca9fb2a97b67c554c253650
author Shunkai Yao <yaoshunkai@google.com> Mon Mar 06 19:06:10 2023 +0000
committer Shunkai Yao <yaoshunkai@google.com> Mon Mar 06 22:48:47 2023 +0000
tree 996c8a0a596ac6ce77cd4d45ab1c1f9321276355
parent 1a7ceedff4e3ea876247f67a4b2f32ced4a5bdcb

Fix handleSetVolume command

No reply data for EFFECT_CMD_SET_VOLUME

Bug: 261129656
Test: Enable AIDL
Test: atest android.media.audio.cts.LoudnessEnhancerTest
Change-Id: I4b08308694dbfe1da6cb5b09d68e33c0a59c1c3a

media/libaudiohal/impl/EffectConversionHelperAidl.cpp

diff --git a/media/libaudiohal/impl/EffectConversionHelperAidl.cpp b/media/libaudiohal/impl/EffectConversionHelperAidl.cpp
index e4a26b1..519b871 100644
--- a/media/libaudiohal/impl/EffectConversionHelperAidl.cpp
+++ b/media/libaudiohal/impl/EffectConversionHelperAidl.cpp
@@ -274,17 +274,17 @@
     return *static_cast<int32_t*>(pReplyData) = OK;
 }
 status_t EffectConversionHelperAidl::handleSetVolume(uint32_t cmdSize, const void* pCmdData,
-                                                     uint32_t* replySize, void* pReplyData) {
-    if (cmdSize != 2 * sizeof(uint32_t) || !pCmdData || !replySize || !pReplyData) {
-        ALOGE("%s parameter invalid %u %p %p %p", __func__, cmdSize, pCmdData, replySize,
-              pReplyData);
+                                                     uint32_t* replySize __unused,
+                                                     void* pReplyData __unused) {
+    if (cmdSize != 2 * sizeof(uint32_t) || !pCmdData) {
+        ALOGE("%s parameter invalid %u %p", __func__, cmdSize, pCmdData);
         return BAD_VALUE;
     }
     Parameter::VolumeStereo volume = {.left = (float)(*(uint32_t*)pCmdData) / (1 << 24),
                                       .right = (float)(*(uint32_t*)pCmdData + 1) / (1 << 24)};
     RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(
             mEffect->setParameter(Parameter::make<Parameter::volumeStereo>(volume))));
-    return *static_cast<int32_t*>(pReplyData) = OK;
+    return OK;
 }
 
 status_t EffectConversionHelperAidl::handleSetOffload(uint32_t cmdSize, const void* pCmdData,