commit 06fdf98d420d0b48832061ba6925559a20ec7e37
author Michael Goffioul <michael.goffioul@lincor.com> Fri Oct 30 16:15:59 2020 -0400
committer Jon West <electrikjesus@gmail.com> Tue May 11 20:40:05 2021 -0400
tree 9da58275fc07b04e8f3b32a7c1d56b599a7790e4
parent 5649870a49cac156bc37f1b164b5e17e84e1c28c

Don't return error status from set_parameters()

Just ignore unknown parameters, always return 0. Returning > 0 makes
Android think the command failed and breaks audio input/output.

audio_hw.c

diff --git a/audio_hw.c b/audio_hw.c
index 1b24995..7bdfd6f 100644
--- a/audio_hw.c
+++ b/audio_hw.c
@@ -706,15 +706,15 @@
     struct audio_device *adev = out->dev;
     struct str_parms *parms;
     char value[32];
-    int ret;
+    int len;
     unsigned int val;
 
     parms = str_parms_create_str(kvpairs);
 
-    ret = str_parms_get_str(parms, AUDIO_PARAMETER_STREAM_ROUTING,
+    len = str_parms_get_str(parms, AUDIO_PARAMETER_STREAM_ROUTING,
                             value, sizeof(value));
     pthread_mutex_lock(&adev->lock);
-    if (ret >= 0) {
+    if (len >= 0) {
         val = atoi(value);
         if ((adev->out_device != val) && (val != 0)) {
             /*
@@ -735,7 +735,7 @@
     pthread_mutex_unlock(&adev->lock);
 
     str_parms_destroy(parms);
-    return ret;
+    return 0;
 }
 
 static char *out_get_parameters(const struct audio_stream *stream __unused, const char *keys __unused)
@@ -1014,15 +1014,15 @@
     struct audio_device *adev = in->dev;
     struct str_parms *parms;
     char value[32];
-    int ret;
+    int len;
     unsigned int val;
 
     parms = str_parms_create_str(kvpairs);
 
-    ret = str_parms_get_str(parms, AUDIO_PARAMETER_STREAM_ROUTING,
+    len = str_parms_get_str(parms, AUDIO_PARAMETER_STREAM_ROUTING,
                             value, sizeof(value));
     pthread_mutex_lock(&adev->lock);
-    if (ret >= 0) {
+    if (len >= 0) {
         val = atoi(value) & ~AUDIO_DEVICE_BIT_IN;
         if ((adev->in_device != val) && (val != 0)) {
             /*
@@ -1043,7 +1043,7 @@
     pthread_mutex_unlock(&adev->lock);
 
     str_parms_destroy(parms);
-    return ret;
+    return 0;
 }
 
 static char * in_get_parameters(const struct audio_stream *stream __unused,