Snap for 10690357 from 92b7af019c74c55764fccb69f490d3b4d051e26e to udc-qpr1-release (ec43d707) · Commits · e / os / android_frameworks_av

media/audioaidlconversion/AidlConversionCppNdk.cpp

+5 −9

Original line number	Diff line number	Diff line
		@@ -508,15 +508,6 @@ const detail::AudioDevicePairs& getAudioDevicePairs() {
		{
		AUDIO_DEVICE_IN_ECHO_REFERENCE, make_AudioDeviceDescription(
		AudioDeviceType::IN_ECHO_REFERENCE)
		},
		{
		AUDIO_DEVICE_IN_REMOTE_SUBMIX, make_AudioDeviceDescription(
		AudioDeviceType::IN_SUBMIX)
		},
		{
		AUDIO_DEVICE_OUT_REMOTE_SUBMIX, make_AudioDeviceDescription(
		AudioDeviceType::OUT_SUBMIX,
		GET_DEVICE_DESC_CONNECTION(VIRTUAL))
		}
		}};
		append_AudioDeviceDescription(pairs,
		@@ -592,6 +583,11 @@ const detail::AudioDevicePairs& getAudioDevicePairs() {
		AUDIO_DEVICE_IN_BLE_HEADSET, AUDIO_DEVICE_OUT_BLE_HEADSET,
		AudioDeviceType::IN_HEADSET, AudioDeviceType::OUT_HEADSET,
		GET_DEVICE_DESC_CONNECTION(BT_LE));
		append_AudioDeviceDescription(pairs,
		AUDIO_DEVICE_IN_REMOTE_SUBMIX, AUDIO_DEVICE_OUT_REMOTE_SUBMIX,
		AudioDeviceType::IN_SUBMIX, AudioDeviceType::OUT_SUBMIX,
		GET_DEVICE_DESC_CONNECTION(VIRTUAL));

		return pairs;
		}();
		return pairs;

+6 −2

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

+2 −1

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

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

		AudioDeviceDescription make_ADD_DefaultOut() {