commit 1dc7cc18becee6ac6cfc13a4b18ddc697b974e98
author Mikhail Naganov <mnaganov@google.com> Wed Oct 11 17:32:22 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 11 17:32:22 2023 +0000
tree 784ef60e391c270a03592f7de05b7159aeaf953f
parent 0e7c9f3dabc4ca8bffe43f703f9d83bec4b29e67
parent e592f1c26986ef0feb18e4acecd0f893f261c2d6

Merge "libaudiohal@aidl: Fix comparison parentheses" into main

media/libaudiohal/impl/DeviceHalAidl.cpp

diff --git a/media/libaudiohal/impl/DeviceHalAidl.cpp b/media/libaudiohal/impl/DeviceHalAidl.cpp
index 21cb39a..b18e64b 100644
--- a/media/libaudiohal/impl/DeviceHalAidl.cpp
+++ b/media/libaudiohal/impl/DeviceHalAidl.cpp
@@ -1708,8 +1708,8 @@
             [&](const auto& pair) {
                 const auto& p = pair.second;
                 LOG_ALWAYS_FATAL_IF(p.ext.getTag() == Tag::mix &&
-                        !p.sampleRate.has_value() || !p.channelMask.has_value() ||
-                        !p.format.has_value() || !p.flags.has_value(),
+                        (!p.sampleRate.has_value() || !p.channelMask.has_value() ||
+                                !p.format.has_value() || !p.flags.has_value()),
                         "%s: stored mix port config is not fully specified: %s",
                         __func__, p.toString().c_str());
                 return p.ext.getTag() == Tag::mix &&