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

Merge "MediaCodec: check for exceptions when creating crypto info" am: 2f222457a2 am: b03acdec6c

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

Change-Id: I76af584956a130a3097b5366be988fdce8b7b71f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-01-12 03:00:57 +00:00
committed by Automerger Merge Worker
parent 3b22bd6973 b03acdec6c
commit eb3cb40db7
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
media/jni/android_media_MediaCodec.cpp
View File

@@ -2432,13 +2432,12 @@ static void android_media_MediaCodec_native_queueLinearBlock(
throwExceptionAsNecessary(env, BAD_VALUE); throwExceptionAsNecessary(env, BAD_VALUE);
return; return;
} }
NativeCryptoInfo cryptoInfo = [env, cryptoInfoObj, size]{ auto cryptoInfo =
if (cryptoInfoObj == nullptr) { cryptoInfoObj ? NativeCryptoInfo{size} : NativeCryptoInfo{env, cryptoInfoObj};
return NativeCryptoInfo{size}; if (env->ExceptionCheck()) {
} else { // Creation of cryptoInfo failed. Let the exception bubble up.
return NativeCryptoInfo{env, cryptoInfoObj}; return;
} }
}();
err = codec->queueEncryptedLinearBlock( err = codec->queueEncryptedLinearBlock(
index, index,
memory, memory,