commit dbeeac039e5b42ab542ff8dd01d4d2007d0d8927
author Craig Donner <cdonner@google.com> Wed Jun 15 16:31:14 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 15 16:31:14 2016 +0000
tree d05c9a88eee46cfce175a52a6467256c1e8b107c
parent 5a71f1a2117f769c1e26b77ccce9199a505c255f
parent 6aa63c2905bb5cbdd0c1c87071e14a0c4185e693

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

Change-Id: I9af94f2f7b3c6ac14530331c73b478f3da9585f2

media/libstagefright/SurfaceUtils.cpp

diff --git a/media/libstagefright/SurfaceUtils.cpp b/media/libstagefright/SurfaceUtils.cpp
index f64bb3e..9940822 100644
--- a/media/libstagefright/SurfaceUtils.cpp
+++ b/media/libstagefright/SurfaceUtils.cpp
@@ -168,10 +168,6 @@
             break;
         }
 
-        if (img == NULL) {
-            ALOGE("error pushing blank frames: lock returned NULL buffer");
-            break;
-        }
         *img = 0;
 
         err = buf->unlock();