commit be9b99580d4692e28c3c5fd27392034c5f2b0c61
author Shunkai Yao <yaoshunkai@google.com> Sat Apr 08 06:52:13 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Apr 08 06:52:13 2023 +0000
tree f1e1ffe56878a412f8109eac611b3f7a3e54e8c5
parent 40b71eec99b15d9c83f787b606a94d253c99db6c
parent 7558913a1600b60f664530d7d18d1a8e1a139fc7

Merge "Fix the error with EffectProxy open" am: 151890f585 am: 005d7c5195 am: 7558913a16

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2526358

Change-Id: I0b2b0c1d1f35838febaeea35e59ab87c0c8eda63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

media/libaudiohal/impl/EffectProxy.cpp

diff --git a/media/libaudiohal/impl/EffectProxy.cpp b/media/libaudiohal/impl/EffectProxy.cpp
index c4d85e5..b61532d 100644
--- a/media/libaudiohal/impl/EffectProxy.cpp
+++ b/media/libaudiohal/impl/EffectProxy.cpp
@@ -158,8 +158,7 @@
     for (auto& sub : mSubEffects) {
         auto& effect = std::get<SubEffectTupleIndex::HANDLE>(sub.second);
         auto& openRet = std::get<SubEffectTupleIndex::RETURN>(sub.second);
-        if (!effect ||
-            (status = effect->open(common, specific, &openRet)).isOk()) {
+        if (!effect || !(status = effect->open(common, specific, &openRet)).isOk()) {
             ALOGE("%s: failed to open UUID %s", __func__, sub.first.uuid.toString().c_str());
             break;
         }