Merge "hal: fix to update voice call devices in apq8084" (5bcf706e) · Commits · e / devices / FP5 / android_hardware_qcom_audio

hal/audio_hw.c

+1 −13

Original line number	Diff line number	Diff line
		@@ -628,8 +628,6 @@ int select_devices(struct audio_device *adev, audio_usecase_t uc_id)
		{
		snd_device_t out_snd_device = SND_DEVICE_NONE;
		snd_device_t in_snd_device = SND_DEVICE_NONE;
		snd_device_t prev_out_snd_device = SND_DEVICE_NONE;
		snd_device_t prev_in_snd_device = SND_DEVICE_NONE;
		struct audio_usecase *usecase = NULL;
		struct audio_usecase *vc_usecase = NULL;
		struct audio_usecase *voip_usecase = NULL;
		@@ -771,12 +769,6 @@ int select_devices(struct audio_device *adev, audio_usecase_t uc_id)
		out_snd_device,
		in_snd_device);

		/* Cache the current usecase devices. This is required to avoid
		* sending device enable command to the external modem.
		*/
		prev_in_snd_device = usecase->in_snd_device;
		prev_out_snd_device = usecase->out_snd_device;

		usecase->in_snd_device = in_snd_device;
		usecase->out_snd_device = out_snd_device;

		@@ -786,14 +778,10 @@ int select_devices(struct audio_device *adev, audio_usecase_t uc_id)
		* Enable device command should be sent to modem only after
		* enabling voice call mixer controls
		*/
		if ((usecase->type == VOICE_CALL) &&
		(prev_in_snd_device != SND_DEVICE_NONE) &&
		(prev_out_snd_device != SND_DEVICE_NONE)) {
		if (usecase->type == VOICE_CALL)
		status = platform_switch_voice_call_usecase_route_post(adev->platform,
		out_snd_device,
		in_snd_device);
		}

		ALOGD("%s: done",__func__);

		return status;