diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-05-01 04:36:24 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-05-01 04:37:17 -0700 |
| commit | f17c0998351f248051645ab3ba21ba9ee57a264d (patch) | |
| tree | 9951dd86d6104f7240bdc8e3e32d49367192f192 | |
| parent | 2a7df583c86ce4506566424103e1ff322f901149 (diff) | |
| download | hardware_qcom_audio-f17c0998351f248051645ab3ba21ba9ee57a264d.tar.gz hardware_qcom_audio-f17c0998351f248051645ab3ba21ba9ee57a264d.tar.bz2 hardware_qcom_audio-f17c0998351f248051645ab3ba21ba9ee57a264d.zip | |
hal: Fix build break when incall music isn't set
Change-Id: I0664812a58022045cce6836c65e651fb6eb6445f
| -rw-r--r-- | hal/voice.c | 2 | ||||
| -rw-r--r-- | hal/voice_extn/voice_extn.h | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/hal/voice.c b/hal/voice.c index 53dc1af4..f5d77ca5 100644 --- a/hal/voice.c +++ b/hal/voice.c @@ -414,11 +414,13 @@ int voice_check_and_set_incall_music_usecase(struct audio_device *adev, { int ret = 0; +#ifdef INCALL_MUSIC_ENABLED ret = voice_extn_check_and_set_incall_music_usecase(adev, out); if (ret == -ENOSYS) { /* Incall music delivery is used only for LCH call state */ ret = -EINVAL; } +#endif return ret; } diff --git a/hal/voice_extn/voice_extn.h b/hal/voice_extn/voice_extn.h index 8c379507..26930deb 100644 --- a/hal/voice_extn/voice_extn.h +++ b/hal/voice_extn/voice_extn.h @@ -104,12 +104,6 @@ static void voice_extn_out_get_parameters(struct stream_out *out __unused, #ifdef INCALL_MUSIC_ENABLED int voice_extn_check_and_set_incall_music_usecase(struct audio_device *adev, struct stream_out *out); -#else -inline int voice_extn_check_and_set_incall_music_usecase(struct audio_device *adev __unused, - struct stream_out *out __unused) -{ - return -ENOSYS; -} #endif #ifdef COMPRESS_VOIP_ENABLED |