commit 5a333c1177225e02c4a203397cbb9c9a32ae8a70
author TreeHugger Robot <treehugger-gerrit@google.com> Sat May 12 01:03:27 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat May 12 01:03:27 2018 +0000
tree 8f2d31cdeb7a97e33ae9bbaa5191d9ef49a56773
parent 2276a705f8b2ae2051217ef9b4748ec56bd5de25
parent 0e0715680dc3e58d8422ed5aeaf766d3e6af5a79

Merge "AudioHal: Do not suspend A2DP on 2nd A2dpSuspended=true request" into pi-dev

hal/msm8916/platform.c

diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index 38c4f49..5c528d7 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -2509,10 +2509,8 @@
     return false;
 }
 
-int platform_get_active_microphones(void *platform __unused,
-                                    audio_devices_t device __unused,
-                                    unsigned int channels __unused,
-                                    int source __unused, audio_usecase_t usecase __unused,
+int platform_get_active_microphones(void *platform __unused, unsigned int channels __unused,
+                                    audio_usecase_t usecase __unused,
                                     struct audio_microphone_characteristic_t *mic_array __unused,
                                     size_t *mic_count __unused) {
     return -ENOSYS;

hal/msm8960/platform.c

diff --git a/hal/msm8960/platform.c b/hal/msm8960/platform.c
index c3c211a..6095ea6 100644
--- a/hal/msm8960/platform.c
+++ b/hal/msm8960/platform.c
@@ -1353,10 +1353,8 @@
     return -ENOSYS;
 }
 
-int platform_get_active_microphones(void *platform __unused,
-                                    audio_devices_t device __unused,
-                                    unsigned int channels __unused,
-                                    int source __unused, audio_usecase_t usecase __unused,
+int platform_get_active_microphones(void *platform __unused, unsigned int channels __unused,
+                                    audio_usecase_t usecase __unused,
                                     struct audio_microphone_characteristic_t *mic_array __unused,
                                     size_t *mic_count __unused) {
     return -ENOSYS;