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

Commit 89869f0a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix "don't leak AUDIO_INPUT_FLAG_DIRECT to HAL version <= 5"" am: 406621c6 am: c59d0c4e 

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

Change-Id: I1fde4ecf4b41b12e6919d759c4f8044efed53e62
parents 122e9ccf c59d0c4e

media/libaudiohal/impl/DeviceHalHidl.cpp

+4 −4
Original line number Diff line number Diff line
@@ -246,6 +246,10 @@ status_t DeviceHalHidl::openInputStream( 
        return status;

    }

    CoreUtils::AudioInputFlags hidlFlags;

#if MAJOR_VERSION <= 5

    // Some flags were specific to framework and must not leak to the HAL.

    flags = static_cast<audio_input_flags_t>(flags & ~AUDIO_INPUT_FLAG_DIRECT);

#endif

    if (status_t status = CoreUtils::audioInputFlagsFromHal(flags, &hidlFlags); status != OK) {

        return status;

    }
@@ -277,10 +281,6 @@ status_t DeviceHalHidl::openInputStream( 
        }

        sinkMetadata.tracks[0].destination.device(std::move(hidlOutputDevice));

    }

#endif

#if MAJOR_VERSION <= 5

    // Some flags were specific to framework and must not leak to the HAL.

    flags = static_cast<audio_input_flags_t>(flags & ~AUDIO_INPUT_FLAG_DIRECT);

#endif

    Return<void> ret = mDevice->openInputStream(

            handle, hidlDevice, hidlConfig, hidlFlags, sinkMetadata,