commit c425880bfec08ec5a75566d90cff121ce52a9311
author Mikhail Naganov <mnaganov@google.com> Mon Feb 08 17:14:17 2021 -0800
committer Mikhail Naganov <mnaganov@google.com> Mon Feb 08 17:14:17 2021 -0800
tree 5799dd282b1f98e8596dddd2bbafc2e5569a6411
parent 210105afef4f6242fa431f2f67fe6c7cc0d11dcd

libaudiohal: Fix initialization of SinkMetadata for HAL V7

Since 'RecordTrackMetadata.channelMask' is a non-optional field,
it must be initialized with a channel mask.

Bug: 171260360
Test: atest audio_health_tests
Change-Id: I8b9378064cd8660d64d7f58fe94377f89e92be45

media/libaudiohal/impl/DeviceHalHidl.cpp

diff --git a/media/libaudiohal/impl/DeviceHalHidl.cpp b/media/libaudiohal/impl/DeviceHalHidl.cpp
index 7b6d1f8..da16477 100644
--- a/media/libaudiohal/impl/DeviceHalHidl.cpp
+++ b/media/libaudiohal/impl/DeviceHalHidl.cpp
@@ -265,6 +265,10 @@
     (void)outputDevice;
     (void)outputDeviceAddress;
 #else
+#if MAJOR_VERSION >= 7
+    (void)HidlUtils::audioChannelMaskFromHal(
+            AUDIO_CHANNEL_NONE, true /*isInput*/, &sinkMetadata.tracks[0].channelMask);
+#endif
     if (outputDevice != AUDIO_DEVICE_NONE) {
         DeviceAddress hidlOutputDevice;
         if (status_t status = CoreUtils::deviceAddressFromHal(