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

Commit 2a0716f4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "audio: Skip AudioModuleRemoteSubmixTest on Android U" into main am:... 

Merge "audio: Skip AudioModuleRemoteSubmixTest on Android U" into main am: 7f25c707 am: 2681bded

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



Change-Id: Iaef21f5f6cde9e24d281b7ff59cb94976285e8b8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f24f1a44 2681bded

audio/aidl/vts/VtsHalAudioCoreModuleTargetTest.cpp

+4 −2
Original line number Diff line number Diff line
@@ -4583,8 +4583,7 @@ GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AudioModulePatch); 
static std::vector<std::string> getRemoteSubmixModuleInstance() {

    auto instances = android::getAidlHalInstanceNames(IModule::descriptor);

    for (auto instance : instances) {

        if (instance.find("r_submix") != std::string::npos)

            return (std::vector<std::string>{instance});

        if (instance.ends_with("/r_submix")) return (std::vector<std::string>{instance});

    }

    return {};

}
@@ -4672,6 +4671,9 @@ class AudioModuleRemoteSubmix : public AudioCoreModule { 
        // Turn off "debug" which enables connections simulation. Since devices of the remote

        // submix module are virtual, there is no need for simulation.

        ASSERT_NO_FATAL_FAILURE(SetUpImpl(GetParam(), false /*setUpDebug*/));

        if (int32_t version; module->getInterfaceVersion(&version).isOk() && version < 2) {

            GTEST_SKIP() << "V1 uses a deprecated remote submix device type encoding";

        }

        ASSERT_NO_FATAL_FAILURE(SetUpModuleConfig());

    }

};