mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
529b47039c
- Functionality tested on mako and klte - In-place upgrade from 17.1 tested working on klte - Compile tested on bacon and klte - Recovery OTA key patch missing, unsure if still needed. - Deblobber needs support for removing vintf manifest paths from vendor Android.bp - Launcher needs more default_workspace grid variants (eg. 4x5)
59 lines
2.3 KiB
Diff
59 lines
2.3 KiB
Diff
From e8b33a3be7b1d0e7aaf041a1664dd09b65686225 Mon Sep 17 00:00:00 2001
|
|
From: codeworkx <daniel.hillenbrand@codeworkx.de>
|
|
Date: Mon, 1 Jul 2019 06:36:30 +0000
|
|
Subject: [PATCH] audio_extn: Fix unused parameter warning in utils.c
|
|
|
|
The unused parameter warning appears if we are not building with
|
|
at least one of the following cflags enabled:
|
|
|
|
* DEV_ARBI_ENABLED
|
|
* SOUND_TRIGGER_ENABLED
|
|
* AUDIO_LISTEN_ENABLED
|
|
|
|
hardware/qcom/audio/hal/audio_extn/utils.c:2522:55: error: unused parameter 'snd_device'
|
|
[-Werror,-Wunused-parameter]
|
|
void audio_extn_utils_release_snd_device(snd_device_t snd_device)
|
|
|
|
Change-Id: Ia2e99b063f4b3c99a4e1e1f6bc50b84252211eb0
|
|
---
|
|
hal/audio_extn/audio_extn.h | 4 ++++
|
|
hal/audio_extn/utils.c | 2 ++
|
|
2 files changed, 6 insertions(+)
|
|
|
|
diff --git a/hal/audio_extn/audio_extn.h b/hal/audio_extn/audio_extn.h
|
|
index b1f4dda75..3a3e38f7f 100644
|
|
--- a/hal/audio_extn/audio_extn.h
|
|
+++ b/hal/audio_extn/audio_extn.h
|
|
@@ -804,7 +804,11 @@ bool audio_extn_utils_is_dolby_format(audio_format_t format);
|
|
int audio_extn_utils_get_bit_width_from_string(const char *);
|
|
int audio_extn_utils_get_sample_rate_from_string(const char *);
|
|
int audio_extn_utils_get_channels_from_string(const char *);
|
|
+#if !defined(DEV_ARBI_ENABLED) && !defined(SOUND_TRIGGER_ENABLED) && !defined(AUDIO_LISTEN_ENABLED)
|
|
+#define audio_extn_utils_release_snd_device(snd_device) (0)
|
|
+#else
|
|
void audio_extn_utils_release_snd_device(snd_device_t snd_device);
|
|
+#endif
|
|
bool audio_extn_utils_is_vendor_enhanced_fwk();
|
|
int audio_extn_utils_get_vendor_enhanced_info();
|
|
int audio_extn_utils_get_app_sample_rate_for_device(struct audio_device *adev,
|
|
diff --git a/hal/audio_extn/utils.c b/hal/audio_extn/utils.c
|
|
index 6dfb98671..0ae9c2657 100644
|
|
--- a/hal/audio_extn/utils.c
|
|
+++ b/hal/audio_extn/utils.c
|
|
@@ -2912,6 +2912,7 @@ int audio_extn_utils_get_channels_from_string(const char *id_string)
|
|
return -EINVAL;
|
|
}
|
|
|
|
+#if defined(DEV_ARBI_ENABLED) || defined(SOUND_TRIGGER_ENABLED) || defined(AUDIO_LISTEN_ENABLED)
|
|
void audio_extn_utils_release_snd_device(snd_device_t snd_device)
|
|
{
|
|
audio_extn_dev_arbi_release(snd_device);
|
|
@@ -2920,6 +2921,7 @@ void audio_extn_utils_release_snd_device(snd_device_t snd_device)
|
|
audio_extn_listen_update_device_status(snd_device,
|
|
LISTEN_EVENT_SND_DEVICE_FREE);
|
|
}
|
|
+#endif
|
|
|
|
int audio_extn_utils_get_license_params(
|
|
const struct audio_device *adev,
|