From dbb0885b754bfd5b367e5278e8c7107a9167830f Mon Sep 17 00:00:00 2001
From: Robert Shih <robertshih@google.com>
Date: Wed, 19 Jul 2023 16:49:02 +0000
Subject: [PATCH] NativeCryptoInfo: fix ctor invocation

( cherry picked from aosp/2652628 )

Bug: 289482631
Test: MediaDrmCodecBlockModelTest#testDecodeShortEncryptedVideo
Merged-In: Ie18af20c2dbc2f51a0ffd83d6642d13c79b08b9f
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 dea7f03d369a5..5ea98c0c67003 100644
--- a/media/jni/android_media_MediaCodec.cpp
+++ b/media/jni/android_media_MediaCodec.cpp
@@ -2615,7 +2615,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;