commit 6aa63c2905bb5cbdd0c1c87071e14a0c4185e693
author Craig Donner <cdonner@google.com> Wed Jun 15 16:14:06 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 15 16:14:07 2016 +0000
tree 11ffa3475e962661bea36cea0964a8575a59fa20
parent af54d1a6f96639b9a42ef25e78093e63af29048d
parent 6dc88629f3c457b4980d7af6ee1a4a9b211b20a7

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

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