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

Merge "Guard against native crash due to null Surface" into pi-dev

Browse Source
This commit is contained in:
Marco Nelissen
2018-04-23 19:58:46 +00:00
committed by Android (Google) Code Review
parent cef96f69d7 59cf9aa283
commit a98bb36fed
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
media/jni/android_media_MediaCodec.cpp
View File

@@ -1261,6 +1261,11 @@ static void android_media_MediaCodec_setInputSurface(
sp<PersistentSurface> persistentSurface =
android_media_MediaCodec_getPersistentInputSurface(env, object);
if (persistentSurface == NULL) {
throwExceptionAsNecessary(
env, BAD_VALUE, ACTION_CODE_FATAL, "input surface not valid");
return;
}
status_t err = codec->setInputSurface(persistentSurface);
if (err != NO_ERROR) {
throwExceptionAsNecessary(env, err);