commit 0c0bdf4db2fd5f450b8a336a526e7a6e064042bf
author Jasmine Cha <chajasmine@google.com> Mon Aug 03 20:08:45 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Aug 03 20:08:45 2020 +0000
tree d4df231ddd47521225474bd97ea9d73df2286f52
parent 4933fe463637b967695b117ea6b582b8cd7f22c0
parent 1eb1f36877ee210c27f751ab1c61d703eb657a26

Audio VTS:  Fix empty parameter list failures for AudioV6 am: 1eb1f36877

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

Change-Id: I1d6209089706af3b44d2578c055087b0b8d0dd06

audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h

diff --git a/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h b/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h
index 8e6be89..ae8e20f 100644
--- a/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h
+++ b/audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h
@@ -729,7 +729,6 @@
                 ::testing::ValuesIn(ConfigHelper::getRecommendedSupportCaptureAudioConfig()),
                 ::testing::Values(AudioInputFlag::NONE)),
         &DeviceConfigParameterToString);
-GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(OptionalInputBufferSizeTest);
 #elif MAJOR_VERSION >= 6
 INSTANTIATE_TEST_CASE_P(SupportedInputBufferSize, RequiredInputBufferSizeTest,
                         ::testing::ValuesIn(getInputDeviceConfigParameters()),
@@ -737,6 +736,7 @@
 #endif
 // When the VTS test runs on a device lacking the corresponding HAL version the parameter
 // list is empty, this isn't a problem.
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(OptionalInputBufferSizeTest);
 GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(RequiredInputBufferSizeTest);
 
 //////////////////////////////////////////////////////////////////////////////