diff options
| author | Yahan Zhou <yahan@google.com> | 2017-09-19 17:43:28 -0700 |
|---|---|---|
| committer | Bo Hu <bohu@google.com> | 2018-05-25 18:17:33 +0000 |
| commit | 56f277aaed3468dab667696031c5107e0c1f4db9 (patch) | |
| tree | 7bc9ab108a216daa3673cafef2da2e01643c5377 | |
| parent | 646286e3ac507849d0891d2499b68e0569216394 (diff) | |
| download | device_generic_goldfish-56f277aaed3468dab667696031c5107e0c1f4db9.tar.gz device_generic_goldfish-56f277aaed3468dab667696031c5107e0c1f4db9.tar.bz2 device_generic_goldfish-56f277aaed3468dab667696031c5107e0c1f4db9.zip | |
[Audio] Return NULL string if not supported
in_get_parameters and out_get_parameters should return NULL string if
not supported.
VTS VtsHalAudioV2_0Target failures 73 -> 45
BUG: 65948494
this cl does not impact real devices
Test: vts-tradefed run vts -m VtsHalAudioV2_0Target
Change-Id: Ib1d9be4b33a41d9365596a61330d25d6dc54a5e7
(cherry picked from commit c7545f97eea00c138b22b9db46926478872929cd)
| -rw-r--r-- | audio/audio_hw.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c index 9c9fdb93..1f9aa65b 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -331,7 +331,7 @@ static char * out_get_parameters(const struct audio_stream *stream, const char * { struct generic_stream_out *out = (struct generic_stream_out *)stream; struct str_parms *query = str_parms_create_str(keys); - char *str; + char *str = NULL; char value[256]; struct str_parms *reply = str_parms_create(); int ret; @@ -342,8 +342,6 @@ static char * out_get_parameters(const struct audio_stream *stream, const char * str_parms_add_int(reply, AUDIO_PARAMETER_STREAM_ROUTING, out->device); pthread_mutex_unlock(&out->lock); str = strdup(str_parms_to_str(reply)); - } else { - str = strdup(keys); } str_parms_destroy(query); @@ -834,7 +832,7 @@ static char * in_get_parameters(const struct audio_stream *stream, { struct generic_stream_in *in = (struct generic_stream_in *)stream; struct str_parms *query = str_parms_create_str(keys); - char *str; + char *str = NULL; char value[256]; struct str_parms *reply = str_parms_create(); int ret; @@ -843,8 +841,6 @@ static char * in_get_parameters(const struct audio_stream *stream, if (ret >= 0) { str_parms_add_int(reply, AUDIO_PARAMETER_STREAM_ROUTING, in->device); str = strdup(str_parms_to_str(reply)); - } else { - str = strdup(keys); } str_parms_destroy(query); |