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

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

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

am: 6aa63c29

Change-Id: I9252fdc41d2dd0842591b16861eb3289bf8165f4
parents 4bf7e172 6aa63c29

media/libstagefright/SurfaceUtils.cpp

+0 −4
Original line number Diff line number Diff line
@@ -168,10 +168,6 @@ 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();