| commit | bb2bf2d62dbe98a6abcd1085250ba5f5c2f52dbe | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Mon Jun 08 17:17:51 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 08 17:17:51 2020 +0000 |
| tree | 16e0567f636bff05d07a5521fb4e164c08d419b7 | |
| parent | 0c62e87a9ea678cca038081b38069d2401136763 [diff] | |
| parent | 53ead60966a29b0f2f99d27a3a6b27c4c32d3232 [diff] |
Merge "audio_alsaops: fix format conversion error handling bug" am: 9a2cf9a818 am: 53ead60966 Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1323975 Change-Id: If3b86f025a61e3151da8e45c6dac1d221c8f3a5c
diff --git a/include/hardware/audio_alsaops.h b/include/hardware/audio_alsaops.h index 6a17a35..476c311 100644 --- a/include/hardware/audio_alsaops.h +++ b/include/hardware/audio_alsaops.h
@@ -60,7 +60,7 @@ case AUDIO_FORMAT_PCM_FLOAT: /* there is no equivalent for float */ default: LOG_ALWAYS_FATAL("pcm_format_from_audio_format: invalid audio format %#x", format); - return 0; + return PCM_FORMAT_INVALID; /* doesn't get here, assert called above */ } } @@ -94,7 +94,7 @@ #endif default: LOG_ALWAYS_FATAL("audio_format_from_pcm_format: invalid pcm format %#x", format); - return 0; + return AUDIO_FORMAT_INVALID; /* doesn't get here, assert called above */ } }