commit 5e406bae9d47b522e29bb1e9b813ba9241a36f5a
author Mikhail Naganov <mnaganov@google.com> Fri Jan 13 00:27:22 2023 +0000
committer Shunkai Yao <yaoshunkai@google.com> Fri Jan 13 02:48:55 2023 +0000
tree fb77dd4ef0d69831272f48cc32d6dffdb5e80928
parent 3140ee1c970faa6e2bb010597a43a2a03ff32fee

Use canonical result handling macros in libaudiohal

For staying aligned with the audioserver code, it is
preferred to use the same utility macros and functions
for dealing with Binder transaction errors.

One missing piece was an overload for statusTFromBinderStatus
which takes ndk::ScopedAStatus, added it.

Bug: 205884982
Test: m
Change-Id: I50815e9cde6cd1ab35b79b01621049bfa4228ba3

media/libaudiohal/impl/EffectHalAidl.cpp

diff --git a/media/libaudiohal/impl/EffectHalAidl.cpp b/media/libaudiohal/impl/EffectHalAidl.cpp
index 31c5ca5..daa68a1 100644
--- a/media/libaudiohal/impl/EffectHalAidl.cpp
+++ b/media/libaudiohal/impl/EffectHalAidl.cpp
@@ -17,9 +17,10 @@
 #define LOG_TAG "EffectHalAidl"
 //#define LOG_NDEBUG 0
 
+#include <error/expected_utils.h>
 #include <media/AidlConversionCppNdk.h>
 #include <media/AidlConversionNdk.h>
-#include <media/audiohal/AudioHalUtils.h>
+#include <media/AidlConversionUtil.h>
 #include <media/EffectsFactoryApi.h>
 #include <mediautils/TimeCheck.h>
 #include <utils/Log.h>
@@ -30,6 +31,7 @@
 
 #include <aidl/android/hardware/audio/effect/IEffect.h>
 
+using ::aidl::android::aidl_utils::statusTFromBinderStatus;
 using ::aidl::android::hardware::audio::effect::CommandId;
 using ::aidl::android::hardware::audio::effect::Descriptor;
 using ::aidl::android::hardware::audio::effect::IEffect;
@@ -85,7 +87,7 @@
     memcpy(&mConfig, pCmdData, cmdSize);
 
     State state;
-    RETURN_IF_BINDER_FAIL(mEffect->getState(&state));
+    RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(mEffect->getState(&state)));
     // effect not open yet, save settings locally
     if (state != State::INIT) {
         effect_config_t* legacyConfig = static_cast<effect_config_t*>(pCmdData);
@@ -103,7 +105,7 @@
         Parameter::Id id;
         id.set<Parameter::Id::commonTag>(Parameter::common);
         aidlParam.set<Parameter::common>(aidlCommon);
-        RETURN_IF_BINDER_FAIL(mEffect->setParameter(aidlParam));
+        RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(mEffect->setParameter(aidlParam)));
     }
     *(int*)pReplyData = 0;
     *static_cast<int32_t*>(pReplyData) = OK;
@@ -153,7 +155,8 @@
             // open with default effect_config_t (convert to Parameter.Common)
             IEffect::OpenEffectReturn ret;
             Parameter::Common common;
-            RETURN_IF_BINDER_FAIL(mEffect->open(common, std::nullopt, &ret));
+            RETURN_STATUS_IF_ERROR(
+                    statusTFromBinderStatus(mEffect->open(common, std::nullopt, &ret)));
             return OK;
         }
         case EFFECT_CMD_SET_CONFIG:
@@ -212,7 +215,7 @@
         return BAD_VALUE;
     }
     Descriptor aidlDesc;
-    RETURN_IF_BINDER_FAIL(mEffect->getDescriptor(&aidlDesc));
+    RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(mEffect->getDescriptor(&aidlDesc)));
 
     *pDescriptor = VALUE_OR_RETURN_STATUS(
             ::aidl::android::aidl2legacy_Descriptor_effect_descriptor(aidlDesc));