Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 192b7b91 authored Aug 21, 2023 by Treehugger Robot Committed by Automerger Merge Worker Aug 21, 2023

Merge "AIDL: Fix test after aosp/2704653" into main am: 07ece85d

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2719575

Change-Id: I8c9717e1a9f37458f90aaa6df01ee097aacf216e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 6581d405 07ece85d

media/audioaidlconversion/TEST_MAPPING

+6 −2

Original line number	Original line	Diff line number	Diff line
	{		{
	"presubmit": [		"presubmit": [
	{		{
	"name": "audio_aidl_conversion_tests",		"name": "audio_aidl_conversion_tests"
	"name": "audio_aidl_ndk_conversion_tests",		},
			{
			"name": "audio_aidl_ndk_conversion_tests"
			},
			{
	"name": "audio_aidl_ndk_cpp_conversion_tests"		"name": "audio_aidl_ndk_cpp_conversion_tests"
	}		}
	]		]

media/libaudioclient/tests/audio_aidl_legacy_conversion_tests.cpp

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -143,7 +143,8 @@ AudioDeviceDescription make_ADD_MicIn() {
	}		}

	AudioDeviceDescription make_ADD_RSubmixIn() {		AudioDeviceDescription make_ADD_RSubmixIn() {
	return make_AudioDeviceDescription(AudioDeviceType::IN_SUBMIX);		return make_AudioDeviceDescription(AudioDeviceType::IN_SUBMIX,
			AudioDeviceDescription::CONNECTION_VIRTUAL());
	}		}

	AudioDeviceDescription make_ADD_DefaultOut() {		AudioDeviceDescription make_ADD_DefaultOut() {