Merge changes I561d6864,I7e909cda into 24D1-dev (76ea415c) · Commits · e / os / android_hardware_interfaces

audio/aidl/vts/VtsHalDynamicsProcessingTest.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -559,7 +559,7 @@ INSTANTIATE_TEST_SUITE_P(
		::android::internal::ToString(std::get<INPUT_GAIN_PARAM>(info.param));
		std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +
		descriptor.common.name + "_UUID_" +
		descriptor.common.id.uuid.toString() + "_inputGains_" + gains;
		toString(descriptor.common.id.uuid) + "_inputGains_" + gains;
		std::replace_if(
		name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');
		return name;
		@@ -652,7 +652,7 @@ INSTANTIATE_TEST_SUITE_P(
		std::to_string(std::get<LIMITER_ENGINE_IN_USE>(info.param));
		std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +
		descriptor.common.name + "_UUID_" +
		descriptor.common.id.uuid.toString() + "_limiterConfig_" +
		toString(descriptor.common.id.uuid) + "_limiterConfig_" +
		cfg.toString() + "_engineSetting_" + engineLimiterInUse;
		std::replace_if(
		name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');
		@@ -726,7 +726,7 @@ INSTANTIATE_TEST_SUITE_P(

		std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +
		descriptor.common.name + "_UUID_" +
		descriptor.common.id.uuid.toString() + "_" + channelConfig +
		toString(descriptor.common.id.uuid) + "_" + channelConfig +
		"_engineInUse_" + engineInUse;
		std::replace_if(
		name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');
		@@ -868,7 +868,7 @@ INSTANTIATE_TEST_SUITE_P(
		std::string stageInUse = std::to_string(std::get<EQ_BAND_STAGE_IN_USE>(info.param));
		std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +
		descriptor.common.name + "_UUID_" +
		descriptor.common.id.uuid.toString() + "_bands_" + bands +
		toString(descriptor.common.id.uuid) + "_bands_" + bands +
		"_stageInUse_" + stageInUse;
		std::replace_if(
		name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');
		@@ -986,7 +986,7 @@ INSTANTIATE_TEST_SUITE_P(
		std::string stageInUse = std::to_string(std::get<MBC_BAND_STAGE_IN_USE>(info.param));
		std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +
		descriptor.common.name + "_UUID_" +
		descriptor.common.id.uuid.toString() + "_bands_" + mbcBands +
		toString(descriptor.common.id.uuid) + "_bands_" + mbcBands +
		"_stageInUse_" + stageInUse;
		std::replace_if(
		name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');

audio/aidl/vts/VtsHalEnvironmentalReverbTargetTest.cpp

+8 −9

Original line number	Diff line number	Diff line
		@@ -249,7 +249,7 @@ INSTANTIATE_TEST_SUITE_P(

		std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +
		descriptor.common.name + "_UUID_" +
		descriptor.common.id.uuid.toString() + "_roomHfLevel" + roomHfLevel;
		toString(descriptor.common.id.uuid) + "_roomHfLevel" + roomHfLevel;
		std::replace_if(
		name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');
		return name;
		@@ -289,7 +289,7 @@ INSTANTIATE_TEST_SUITE_P(

		std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +
		descriptor.common.name + "_UUID_" +
		descriptor.common.id.uuid.toString() + "_decayTime" + decayTime;
		toString(descriptor.common.id.uuid) + "_decayTime" + decayTime;
		std::replace_if(
		name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');
		return name;
		@@ -329,8 +329,7 @@ INSTANTIATE_TEST_SUITE_P(

		std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +
		descriptor.common.name + "_UUID_" +
		descriptor.common.id.uuid.toString() + "_decayHfRatio" +
		decayHfRatio;
		toString(descriptor.common.id.uuid) + "_decayHfRatio" + decayHfRatio;
		std::replace_if(
		name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');
		return name;
		@@ -370,7 +369,7 @@ INSTANTIATE_TEST_SUITE_P(

		std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +
		descriptor.common.name + "_UUID_" +
		descriptor.common.id.uuid.toString() + "_level" + level;
		toString(descriptor.common.id.uuid) + "_level" + level;
		std::replace_if(
		name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');
		return name;
		@@ -410,7 +409,7 @@ INSTANTIATE_TEST_SUITE_P(

		std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +
		descriptor.common.name + "_UUID_" +
		descriptor.common.id.uuid.toString() + "_delay" + delay;
		toString(descriptor.common.id.uuid) + "_delay" + delay;
		std::replace_if(
		name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');
		return name;
		@@ -450,7 +449,7 @@ INSTANTIATE_TEST_SUITE_P(

		std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +
		descriptor.common.name + "_UUID_" +
		descriptor.common.id.uuid.toString() + "_diffusion" + diffusion;
		toString(descriptor.common.id.uuid) + "_diffusion" + diffusion;
		std::replace_if(
		name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');
		return name;
		@@ -490,7 +489,7 @@ INSTANTIATE_TEST_SUITE_P(

		std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +
		descriptor.common.name + "_UUID_" +
		descriptor.common.id.uuid.toString() + "_density" + density;
		toString(descriptor.common.id.uuid) + "_density" + density;
		std::replace_if(
		name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');
		return name;
		@@ -527,7 +526,7 @@ INSTANTIATE_TEST_SUITE_P(

		std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +
		descriptor.common.name + "_UUID_" +
		descriptor.common.id.uuid.toString() + "_bypass" + bypass;
		toString(descriptor.common.id.uuid) + "_bypass" + bypass;
		std::replace_if(
		name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');
		return name;

audio/aidl/vts/VtsHalHapticGeneratorTargetTest.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -225,7 +225,7 @@ INSTANTIATE_TEST_SUITE_P(
		std::to_string(std::get<PARAM_VIBRATION_INFORMATION_MAX_AMPLITUDE>(info.param));
		std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +
		descriptor.common.name + "_UUID_" +
		descriptor.common.id.uuid.toString() + "_hapticScaleId" +
		toString(descriptor.common.id.uuid) + "_hapticScaleId" +
		hapticScaleID + "_hapticScaleVibScale" + hapticScaleVibScale +
		"_resonantFrequency" + resonantFrequency + "_qFactor" + qFactor +
		"_maxAmplitude" + maxAmplitude;
		@@ -422,7 +422,7 @@ INSTANTIATE_TEST_SUITE_P(
		auto descriptor = std::get<PARAM_INSTANCE_NAME>(info.param).second;
		std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +
		descriptor.common.name + "_UUID_" +
		descriptor.common.id.uuid.toString();
		toString(descriptor.common.id.uuid);
		std::replace_if(
		name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');
		return name;

audio/aidl/vts/VtsHalVolumeTargetTest.cpp

+7 −1

Original line number	Diff line number	Diff line
		@@ -140,7 +140,9 @@ using VolumeDataTestParam = std::pair<std::shared_ptr<IFactory>, Descriptor>;
		class VolumeDataTest : public ::testing::TestWithParam<VolumeDataTestParam>,
		public VolumeControlHelper {
		public:
		VolumeDataTest() {
		VolumeDataTest()
		: kVsrApiLevel(
		android::base::GetIntProperty("ro.vendor.api_level", __ANDROID_API_FUTURE__)) {
		std::tie(mFactory, mDescriptor) = GetParam();
		mInput.resize(kBufferSize);
		mInputMag.resize(mTestFrequencies.size());
		@@ -165,13 +167,17 @@ class VolumeDataTest : public ::testing::TestWithParam<VolumeDataTestParam>,

		void SetUp() override {
		SKIP_TEST_IF_DATA_UNSUPPORTED(mDescriptor.common.flags);
		// Skips test fixture if api_level <= 34 (__ANDROID_API_U__).
		if (kVsrApiLevel <= __ANDROID_API_U__) GTEST_SKIP();
		ASSERT_NO_FATAL_FAILURE(SetUpVolumeControl());
		}
		void TearDown() override {
		SKIP_TEST_IF_DATA_UNSUPPORTED(mDescriptor.common.flags);
		if (kVsrApiLevel <= __ANDROID_API_U__) GTEST_SKIP();
		TearDownVolumeControl();
		}

		const int kVsrApiLevel;
		static constexpr int kMaxAudioSample = 1;
		static constexpr int kTransitionDuration = 300;
		static constexpr int kNPointFFT = 32768;