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

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

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

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



Change-Id: If2218dbdfbc7696446c38cdd4fd684dd41892bb8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0f96b2b3 151890f5

media/libaudiohal/impl/EffectProxy.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -158,8 +158,7 @@ ndk::ScopedAStatus EffectProxy::open(const Parameter::Common& common, 
    for (auto& sub : mSubEffects) {

    for (auto& sub : mSubEffects) {

        auto& effect = std::get<SubEffectTupleIndex::HANDLE>(sub.second);

        auto& effect = std::get<SubEffectTupleIndex::HANDLE>(sub.second);

        auto& openRet = std::get<SubEffectTupleIndex::RETURN>(sub.second);

        auto& openRet = std::get<SubEffectTupleIndex::RETURN>(sub.second);

        if (!effect ||

        if (!effect || !(status = effect->open(common, specific, &openRet)).isOk()) {

            (status = effect->open(common, specific, &openRet)).isOk()) {

            ALOGE("%s: failed to open UUID %s", __func__, sub.first.uuid.toString().c_str());

            ALOGE("%s: failed to open UUID %s", __func__, sub.first.uuid.toString().c_str());

            break;

            break;

        }

        }