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

Commit 592c13ef authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

libmedia: Fix channelMaskFromString function 

Fix erroneous "!found1 || !found2 => miss" condition to
"!found1 && !found2 => miss".

Bug: 64130154
Test: VTS
Change-Id: I8f8527428eb70e7f177ad440a696c1ec7c7668e0
parent 8b852805

media/libmedia/TypeConverter.cpp

+1 −1
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ audio_format_t formatFromString(const std::string &literalFormat, audio_format_t 
audio_channel_mask_t channelMaskFromString(const std::string &literalChannels)

{

    audio_channel_mask_t channels;

    if (!OutputChannelConverter::fromString(literalChannels, channels) ||

    if (!OutputChannelConverter::fromString(literalChannels, channels) &&

            !InputChannelConverter::fromString(literalChannels, channels)) {

        return AUDIO_CHANNEL_INVALID;

    }