commit 1f76049c955c605b61ef0d923582c740c325b1a0
author Christopher Wiley <wiley@google.com> Wed Oct 28 18:14:01 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 28 18:14:01 2015 +0000
tree 73e5f0217e12a64e4ad61c6818b380a567ab82d6
parent af5c3b1d6a9cc1d36b526291391009b2a4e097ff
parent 97887989495318803643c91b196b6bcabf2a7a03

Merge "libbinder: Fix out of bounds in readBoolVector"

services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp

diff --git a/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp b/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
index 6ef3295..70af656 100644
--- a/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
+++ b/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
@@ -67,6 +67,7 @@
     mConsumer->setDefaultBufferFormat(mHwc.getFormat(disp));
     mConsumer->setDefaultBufferSize(mHwc.getWidth(disp),  mHwc.getHeight(disp));
     mConsumer->setDefaultMaxBufferCount(NUM_FRAMEBUFFER_SURFACE_BUFFERS);
+    mConsumer->setMaxAcquiredBufferCount(NUM_FRAMEBUFFER_SURFACE_BUFFERS - 1);
 }
 
 status_t FramebufferSurface::beginFrame(bool /*mustRecompose*/) {