Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 877fac01 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

Merge "libaudiohal@aidl: Fix comparison parentheses" into main am: 1dc7cc18 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2777268



Change-Id: Id2c9a483eeea6f16a0218c0272f991aadfb5c06b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eb573246 1dc7cc18

media/libaudiohal/impl/DeviceHalAidl.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -1708,8 +1708,8 @@ DeviceHalAidl::PortConfigs::iterator DeviceHalAidl::findPortConfig( 
            [&](const auto& pair) {

            [&](const auto& pair) {

                const auto& p = pair.second;

                const auto& p = pair.second;

                LOG_ALWAYS_FATAL_IF(p.ext.getTag() == Tag::mix &&

                LOG_ALWAYS_FATAL_IF(p.ext.getTag() == Tag::mix &&

                        !p.sampleRate.has_value() || !p.channelMask.has_value() ||

                        (!p.sampleRate.has_value() || !p.channelMask.has_value() ||

                        !p.format.has_value() || !p.flags.has_value(),

                                !p.format.has_value() || !p.flags.has_value()),

                        "%s: stored mix port config is not fully specified: %s",

                        "%s: stored mix port config is not fully specified: %s",

                        __func__, p.toString().c_str());

                        __func__, p.toString().c_str());

                return p.ext.getTag() == Tag::mix &&

                return p.ext.getTag() == Tag::mix &&