commit 9471c69773db672254012c43856b0c73b843b4d6
author Jesse Hall <jessehall@google.com> Fri May 02 16:50:40 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 02 16:50:41 2014 +0000
tree 2c14ab23252d463477449266a78d41df93709fc8
parent c526c35e7398ad06185ea0575a976933b433441d
parent 0b63cd105cae094c21aafaa2bac8322427e75827

Merge "Handle failed requestBuffer after successful dequeueBuffer"

services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp

diff --git a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp
index 1362ae8..c415560 100644
--- a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp
+++ b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp
@@ -302,7 +302,12 @@
         }
     }
     if (result & BUFFER_NEEDS_REALLOCATION) {
-        mSource[source]->requestBuffer(*sslot, &mProducerBuffers[pslot]);
+        result = mSource[source]->requestBuffer(*sslot, &mProducerBuffers[pslot]);
+        if (result < 0) {
+            mProducerBuffers[pslot].clear();
+            mSource[source]->cancelBuffer(*sslot, *fence);
+            return result;
+        }
         VDS_LOGV("dequeueBuffer(%s): buffers[%d]=%p fmt=%d usage=%#x",
                 dbgSourceStr(source), pslot, mProducerBuffers[pslot].get(),
                 mProducerBuffers[pslot]->getPixelFormat(),