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

Commit 9cc3104f 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 

am: 34dd1000

Change-Id: I3758948149fb9c50732782b86b2d330e80b94e64
parents c593d454 34dd1000

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