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

Commit 8244c117 authored by Craig Donner's avatar Craig Donner Committed by android-build-merger
Browse files

Merge "Handle lock() returning a NULL buffer in SurfaceUtils." into nyc-dev 

am: d4984192

* commit 'd4984192':
  Handle lock() returning a NULL buffer in SurfaceUtils.

Change-Id: Ifd7e931628b140de630479fbbc4b20e1cfa61512
parents 507c191a d4984192

media/libstagefright/SurfaceUtils.cpp

+4 −0
Original line number Diff line number Diff line
@@ -168,6 +168,10 @@ status_t pushBlankBuffersToNativeWindow(ANativeWindow *nativeWindow /* nonnull * 
            break;

        }



        if (img == NULL) {

            ALOGE("error pushing blank frames: lock returned NULL buffer");

            break;

        }

        *img = 0;



        err = buf->unlock();