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

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

Merge "AIDL effect: Effect factory add EffectProxy information in proxy" am:... 

Merge "AIDL effect: Effect factory add EffectProxy information in proxy" am: ff16dd1f am: a3e89e9f am: 7b7a074c am: c23af93d

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2459230



Change-Id: I70ab1398525ff6147b2126d1409abefdd325e9f7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fbba925d c23af93d

audio/aidl/default/EffectFactory.cpp

+2 −0
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ ndk::ScopedAStatus Factory::queryEffects(const std::optional<AudioUuid>& in_type 
            RETURN_IF(!libInterface || !libInterface->queryEffectFunc, EX_NULL_POINTER,

                      "dlNullQueryEffectFunc");

            RETURN_IF_BINDER_EXCEPTION(libInterface->queryEffectFunc(&id.uuid, &desc));

            // update proxy UUID with information from config xml

            desc.common.id.proxy = id.proxy;

            _aidl_return->emplace_back(std::move(desc));

        }

    }

audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp

+9 −2
Original line number Diff line number Diff line
@@ -139,7 +139,10 @@ TEST_P(AudioEffectTest, GetDescritorBeforeOpen) { 
    Descriptor desc;

    ASSERT_NO_FATAL_FAILURE(create(mFactory, mEffect, mDescriptor));

    ASSERT_NO_FATAL_FAILURE(getDescriptor(mEffect, desc));

    EXPECT_EQ(mDescriptor.common, desc.common);

    EXPECT_EQ(mDescriptor.common.id.type, desc.common.id.type);

    EXPECT_EQ(mDescriptor.common.id.uuid, desc.common.id.uuid);

    EXPECT_EQ(mDescriptor.common.name, desc.common.name);

    EXPECT_EQ(mDescriptor.common.implementor, desc.common.implementor);

    // Effect implementation Must fill in implementor and name

    EXPECT_NE("", desc.common.name);

    EXPECT_NE("", desc.common.implementor);
@@ -176,7 +179,11 @@ TEST_P(AudioEffectTest, DescriptorExistAndUnique) { 


    ASSERT_NO_FATAL_FAILURE(create(mFactory, mEffect, mDescriptor));

    ASSERT_NO_FATAL_FAILURE(getDescriptor(mEffect, desc));

    EXPECT_EQ(1ul, idSet.count(desc.common.id));

    int uuidCount = std::count_if(idSet.begin(), idSet.end(), [&](const auto& id) {

        return id.uuid == desc.common.id.uuid && id.type == desc.common.id.type;

    });



    EXPECT_EQ(1, uuidCount);

    ASSERT_NO_FATAL_FAILURE(destroy(mFactory, mEffect));

}