commit 4001a56758d1521f99623111595f95147ed51bbf
author Craig Donner <cdonner@google.com> Sat Sep 24 10:03:17 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Sep 24 10:03:17 2016 +0000
tree dd41aaf59f392cd63609c1aabfacb09f92c38a65
parent 237f0d6a52bc68465e327cf6ce6d601784254b7c
parent a092e5581926703ecfe296e64d3a8fe7d7c65984

Revert "Handle lock() returning a NULL buffer in SurfaceUtils."
am: a092e55819

Change-Id: I6f5a9999990547c83c4485ff2db4ba51f9802654

media/libstagefright/SurfaceUtils.cpp

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