commit a852bbd2fa21b861b7a5e2bb0089ab1e578cced6
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 22 17:33:33 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 22 17:33:33 2020 +0000
tree 7223ff3232e46db0bb3354f390772364e278c5b8
parent 49fe9e8f79d6410f32e442ac320166d2f228bc61
parent bbfc1b857c1db3f1d41963678866c8df9f660334

Merge "Fix out set parameters success return code" am: bbfc1b857c

Change-Id: Ib64cc0ba29ae09df2a60dcb45f79567367d510e5

audio/audio_hw.c

diff --git a/audio/audio_hw.c b/audio/audio_hw.c
index 56b3e14..02ce250 100644
--- a/audio/audio_hw.c
+++ b/audio/audio_hw.c
@@ -362,12 +362,16 @@
     struct alsa_audio_device *adev = out->dev;
     struct str_parms *parms;
     char value[32];
-    int ret, val = 0;
+    int val = 0;
+    int ret = -EINVAL;
+
+    if (kvpairs == NULL || kvpairs[0] == 0) {
+        return 0;
+    }
 
     parms = str_parms_create_str(kvpairs);
 
-    ret = str_parms_get_str(parms, AUDIO_PARAMETER_STREAM_ROUTING, value, sizeof(value));
-    if (ret >= 0) {
+    if (str_parms_get_str(parms, AUDIO_PARAMETER_STREAM_ROUTING, value, sizeof(value)) >= 0) {
         val = atoi(value);
         pthread_mutex_lock(&adev->lock);
         pthread_mutex_lock(&out->lock);
@@ -377,6 +381,7 @@
         }
         pthread_mutex_unlock(&out->lock);
         pthread_mutex_unlock(&adev->lock);
+        ret = 0;
     }
 
     str_parms_destroy(parms);