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

Commit 7c4ae57f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "NativeCryptoInfo: fix ctor invocation" into main am: 1f108e02 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2652628



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

media/jni/android_media_MediaCodec.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2491,7 +2491,7 @@ static void android_media_MediaCodec_native_queueLinearBlock( 
            return;

        }

        auto cryptoInfo =

                cryptoInfoObj ? NativeCryptoInfo{size} : NativeCryptoInfo{env, cryptoInfoObj};

                cryptoInfoObj ? NativeCryptoInfo{env, cryptoInfoObj} : NativeCryptoInfo{size};

        if (env->ExceptionCheck()) {

            // Creation of cryptoInfo failed. Let the exception bubble up.

            return;