Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa7ab318 authored by Shunkai Yao's avatar Shunkai Yao Committed by Automerger Merge Worker
Browse files

Merge "Fix the error with EffectProxy open" am: 151890f5 am: 005d7c51 am:... 

Merge "Fix the error with EffectProxy open" am: 151890f5 am: 005d7c51 am: 7558913a am: be9b9958

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



Change-Id: Ibf0640a910e0ff0cdcdf62690b502deafe9fb5c0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4549708b be9b9958

media/libaudiohal/impl/EffectProxy.cpp

+1 −2
Original line number Diff line number Diff line
@@ -158,8 +158,7 @@ ndk::ScopedAStatus EffectProxy::open(const Parameter::Common& common, 
    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;

        }