Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34dd1000 authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

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

am: a98bb36f

Change-Id: I9cb3e75cdd72592250f755a575c138ecedd3a51b
parents c595c5c0 a98bb36f

media/jni/android_media_MediaCodec.cpp

+5 −0
Original line number Diff line number Diff line
@@ -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);