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

Commit a98bb36f authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

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

parents cef96f69 59cf9aa2
Loading
Loading
Loading
Loading
+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);