From fe3785c3ff2b7698590770f2582bdf6900656c18 Mon Sep 17 00:00:00 2001 From: Robert Shih Date: Tue, 11 Jul 2023 07:27:02 +0000 Subject: [PATCH] NativeCryptoInfo: fix ctor invocation Bug: 289482631 Test: MediaDrmCodecBlockModelTest#testDecodeShortEncryptedVideo Change-Id: Ie18af20c2dbc2f51a0ffd83d6642d13c79b08b9f --- media/jni/android_media_MediaCodec.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/jni/android_media_MediaCodec.cpp b/media/jni/android_media_MediaCodec.cpp index b878bcf5dfefa..53c02663636a2 100644 --- a/media/jni/android_media_MediaCodec.cpp +++ b/media/jni/android_media_MediaCodec.cpp @@ -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;