Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 22:04:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "audio: Skip AudioModuleRemoteSubmixTest on Android U" into main am: 7f25c70740 am: 2681bdedf0

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

Change-Id: Iaef21f5f6cde9e24d281b7ff59cb94976285e8b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-01-12 22:01:17 +00:00
committed by Automerger Merge Worker
parent f24f1a4409 2681bdedf0
commit 2a0716f4cb
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
audio/aidl/vts/VtsHalAudioCoreModuleTargetTest.cpp
View File

@@ -4583,8 +4583,7 @@ GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AudioModulePatch);
static std::vector<std::string> getRemoteSubmixModuleInstance() { static std::vector<std::string> getRemoteSubmixModuleInstance() {
auto instances = android::getAidlHalInstanceNames(IModule::descriptor); auto instances = android::getAidlHalInstanceNames(IModule::descriptor);
for (auto instance : instances) { for (auto instance : instances) {
if (instance.find("r_submix") != std::string::npos) if (instance.ends_with("/r_submix")) return (std::vector<std::string>{instance});
return (std::vector<std::string>{instance});
} }
return {}; return {};
} }
@@ -4672,6 +4671,9 @@ class AudioModuleRemoteSubmix : public AudioCoreModule {
// Turn off "debug" which enables connections simulation. Since devices of the remote // Turn off "debug" which enables connections simulation. Since devices of the remote
// submix module are virtual, there is no need for simulation. // submix module are virtual, there is no need for simulation.
ASSERT_NO_FATAL_FAILURE(SetUpImpl(GetParam(), false /*setUpDebug*/)); 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()); ASSERT_NO_FATAL_FAILURE(SetUpModuleConfig());
} }
}; };