Merge "hal: avoid stopping VoIP mistakenly when VoIP standby" (5cc0bcdb) · Commits · e / devices / Fairphone 4 / android_hardware_qcom_audio

hal/audio_hw.c

+4 −8

Original line number	Diff line number	Diff line
		@@ -4372,6 +4372,7 @@ static int in_standby(struct audio_stream *stream)
		pthread_mutex_lock(&adev->lock);
		in->standby = true;
		if (in->usecase == USECASE_COMPRESS_VOIP_CALL) {
		do_stop = false;
		voice_extn_compress_voip_close_input_stream(stream);
		ALOGD("VOIP input entered standby");
		} else if (in->usecase == USECASE_AUDIO_RECORD_MMAP) {
		@@ -4380,18 +4381,13 @@ static int in_standby(struct audio_stream *stream)
		} else {
		if (audio_extn_cin_attached_usecase(in->usecase))
		audio_extn_cin_stop_input_stream(in);
		if (in->pcm) {
		pcm_close(in->pcm);
		in->pcm = NULL;
		}
		status = stop_input_stream(in);
		}

		if (do_stop) {
		if (in->pcm) {
		pcm_close(in->pcm);
		in->pcm = NULL;
		}

		if (do_stop) {
		status = stop_input_stream(in);
		}
		pthread_mutex_unlock(&adev->lock);