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

Merge "Merge "NativeCryptoInfo: fix ctor invocation" into main am: 1f108e0203 am: 7c4ae57f9c" into udc-dev-plus-aosp am: 3e4cb76551 am: 11c7582b31 am: 89a6b69183

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

Change-Id: I291ac10001dd5468f4088acaa29f90c80318fa4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Automerger Merge Worker
2023-07-19 22:56:16 +00:00
parent 2baa67b599 89a6b69183
commit b1b3a7ffd9
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

@@ -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;