Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ia9237e06db6d58dda062bafcefc4cb70ccb4135a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-07-19 19:57:15 +00:00
committed by Automerger Merge Worker
parent d36dfbe55d 1f108e0203
commit 7c4ae57f9c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/jni/android_media_MediaCodec.cpp
View File

@@ -2491,7 +2491,7 @@ static void android_media_MediaCodec_native_queueLinearBlock(
return; return;
} }
auto cryptoInfo = auto cryptoInfo =
cryptoInfoObj ? NativeCryptoInfo{size} : NativeCryptoInfo{env, cryptoInfoObj}; cryptoInfoObj ? NativeCryptoInfo{env, cryptoInfoObj} : NativeCryptoInfo{size};
if (env->ExceptionCheck()) { if (env->ExceptionCheck()) {
// Creation of cryptoInfo failed. Let the exception bubble up. // Creation of cryptoInfo failed. Let the exception bubble up.
return; return;