Fix routing for wired headset (8637747f) · Commits · e / devices / Fairphone 4 / android_hardware_qcom_audio

hal/audio_hw.c

+15 −0

Original line number	Diff line number	Diff line
		@@ -370,6 +370,9 @@ static snd_device_t get_output_snd_device(struct audio_device *adev)
		} else if (devices == (AUDIO_DEVICE_OUT_WIRED_HEADSET \|
		AUDIO_DEVICE_OUT_SPEAKER)) {
		snd_device = SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES;
		} else if (devices == (AUDIO_DEVICE_OUT_WIRED_HEADSET \|
		AUDIO_DEVICE_OUT_WIRED_HEADPHONE)) {
		snd_device = SND_DEVICE_OUT_HEADPHONES;
		} else if (devices == (AUDIO_DEVICE_OUT_AUX_DIGITAL \|
		AUDIO_DEVICE_OUT_SPEAKER)) {
		snd_device = SND_DEVICE_OUT_SPEAKER_AND_HDMI;
		@@ -381,6 +384,18 @@ static snd_device_t get_output_snd_device(struct audio_device *adev)
		goto exit;
		}
		}

		if (popcount(devices) == 3) {
		if (devices == (AUDIO_DEVICE_OUT_WIRED_HEADPHONE \|
		AUDIO_DEVICE_OUT_WIRED_HEADSET \|
		AUDIO_DEVICE_OUT_SPEAKER)) {
		snd_device = SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES;
		} else {
		ALOGE("%s: Invalid combo device(0x%x)", __func__, devices);
		}
		goto exit;
		}

		if (popcount(devices) != 1) {
		ALOGE("%s: Invalid output devices(0x%x)", __func__, devices);
		goto exit;