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

Commit 92b628a9 authored by Brian Lindahl's avatar Brian Lindahl Committed by Automerger Merge Worker
Browse files

Merge "Fix deadlock in MediaCodec::configure when peek default mode is used"... 

Merge "Fix deadlock in MediaCodec::configure when peek default mode is used" into tm-dev am: 97b67e31 am: 6ee3d0a0

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



Change-Id: I8925aaf727ba3ce70947d2f34898425bee3f57fb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 844681f0 6ee3d0a0

media/libstagefright/MediaCodec.cpp

+1 −1
Original line number Diff line number Diff line
@@ -3974,7 +3974,7 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { 
            if (mTunneled && (mTunnelPeekState == TunnelPeekState::kLegacyMode)) {

                sp<AMessage> params = new AMessage;

                params->setInt32("android._tunnel-peek-set-legacy", 1);

                setParameters(params);

                onSetParameters(params);

            }



            int32_t background = 0;