From 8771cecb99b6b5f407062e565c5eb1a02614f4d8 Mon Sep 17 00:00:00 2001 From: Shunkai Yao Date: Wed, 20 Sep 2023 22:46:59 +0000 Subject: [PATCH] Effect AIDL: correct some code format Bug: 300735428 Test: atest VtsHalAudioEffectTargetTest Change-Id: Ic4c925ea14e08418e56ad108468f61b049280f70 --- audio/aidl/vts/TestUtils.h | 10 +++++----- audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/audio/aidl/vts/TestUtils.h b/audio/aidl/vts/TestUtils.h index 10c2fc652d..b559669856 100644 --- a/audio/aidl/vts/TestUtils.h +++ b/audio/aidl/vts/TestUtils.h @@ -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"; \ + } \ }) \ No newline at end of file diff --git a/audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp b/audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp index aa61593dfa..1876756437 100644 --- a/audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp +++ b/audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp @@ -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, 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) {