tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes I34db56fe,I539b408f,I76155f89 into udc-qpr-dev am: 83dcb849d7

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24816701

Change-Id: Ieaf64d15383104f0200dbd2c97a177762a0061ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-09-21 21:22:49 +00:00 committed by Automerger Merge Worker
commit d7ba06c414
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
audio/aidl/vts/TestUtils.h
View file

@ -78,9 +78,9 @@ inline ::testing::AssertionResult assertResult(const char* exp_expr, const char*
EXPECT_PRED_FORMAT2(::android::hardware::audio::common::testing::detail::assertResult, \
expected, ret)
#define SKIP_TEST_IF_DATA_UNSUPPORTED(flags) \
({ \
if ((flags).hwAcceleratorMode == Flags::HardwareAccelerator::TUNNEL || (flags).bypass) { \
GTEST_SKIP() << "Skip data path for offload"; \
} \
#define SKIP_TEST_IF_DATA_UNSUPPORTED(flags) \
({ \
if ((flags).hwAcceleratorMode == Flags::HardwareAccelerator::TUNNEL || (flags).bypass) { \
GTEST_SKIP() << "Skip data path for offload"; \
} \
})

12
audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp
View file

@ -42,11 +42,11 @@ using ndk::ScopedAStatus;
using aidl::android::hardware::audio::effect::CommandId;
using aidl::android::hardware::audio::effect::Descriptor;
using aidl::android::hardware::audio::effect::Flags;
using aidl::android::hardware::audio::effect::IEffect;
using aidl::android::hardware::audio::effect::IFactory;
using aidl::android::hardware::audio::effect::Parameter;
using aidl::android::hardware::audio::effect::State;
using aidl::android::hardware::audio::effect::Flags;
using aidl::android::media::audio::common::AudioDeviceDescription;
using aidl::android::media::audio::common::AudioDeviceType;
using aidl::android::media::audio::common::AudioMode;
@ -87,11 +87,11 @@ class AudioEffectTest : public testing::TestWithParam<EffectTestParam>, public E
};
class AudioEffectDataPathTest : public AudioEffectTest {
public:
void SetUp() override {
AudioEffectTest::SetUp();
SKIP_TEST_IF_DATA_UNSUPPORTED(mDescriptor.common.flags);
}
public:
void SetUp() override {
AudioEffectTest::SetUp();
SKIP_TEST_IF_DATA_UNSUPPORTED(mDescriptor.common.flags);
}
};
TEST_P(AudioEffectTest, SetupAndTearDown) {