Merge "Merge "NativeCryptoInfo: fix ctor invocation" into main am: 1f108e0203... (3e4cb765) · Commits · e / os / android_frameworks_base

media/jni/android_media_MediaCodec.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;