| commit | 7558913a1600b60f664530d7d18d1a8e1a139fc7 | [log] [tgz] |
|---|---|---|
| author | Shunkai Yao <yaoshunkai@google.com> | Sat Apr 08 06:22:04 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Apr 08 06:22:04 2023 +0000 |
| tree | 02b59c5086f450922f9d5aafee7dc7f2b0f1977b | |
| parent | a7c4cd8b03d66658ca1268eaead0af9a0dd3b848 [diff] | |
| parent | 005d7c5195e02c4786924bb9ce6759dd3f9d6077 [diff] |
Merge "Fix the error with EffectProxy open" am: 151890f585 am: 005d7c5195 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2526358 Change-Id: Ie2f0aac6abc68fcf78bcefad94f0de5049a5c71b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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; }