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

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

Merge changes from topic "effect_proxy_align" into main am: 46f4d29b 

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



Change-Id: I6c19093c5b10e81f8ccb46e6a4724b3e2713ebc1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6392664c 46f4d29b

media/libaudiohal/impl/EffectProxy.cpp

+0 −4
Original line number Diff line number Diff line
@@ -206,10 +206,6 @@ Descriptor::Common EffectProxy::buildDescriptorCommon( 
            ALOGW("Inconsistent flags %s vs %s", desc.common.flags.toString().c_str(),

                  firstFlag.toString().c_str());

        }

        // set to AUXILIARY if any sub-effect is of AUXILIARY type

        if (desc.common.flags.type == Flags::Type::AUXILIARY) {

            common.flags.type = Flags::Type::AUXILIARY;

        }

    }



    swCommon.flags.offloadIndication = offloadExist;