commit 9a2cf9a81852548e1af0247d4f8fe7e9080dd3fc
author Andy Hung <hunga@google.com> Mon Jun 08 16:39:07 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 08 16:39:07 2020 +0000
tree 9e63193fbe10f68fcd366da8c5a385cbd399b951
parent 76f174cfe4d52a2788e74cd47367d8fa4e896319
parent 8681eabddfe073ad5981ab5972eb786bc55f9e48

Merge "audio_alsaops: fix format conversion error handling bug"

include/hardware/audio_alsaops.h

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 */
     }
 }