am fcf9c1ba: Merge "SurfaceFlinger: mFbFence initialization"

* commit 'fcf9c1bafb251c186191b9d066ed00d0b59b962a': SurfaceFlinger: mFbFence initialization
2014-01-26 08:45:40 -08:00 · 2014-01-26 08:45:40 -08:00 · 8c303f7e64
parent e3aeefd1f8 fcf9c1bafb
commit 8c303f7e64
1 changed files with 1 additions and 0 deletions
--- a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp
+++ b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp
@ -458,6 +458,7 @@ void VirtualDisplaySurface::resetPerFrameState() {
    mCompositionType = COMPOSITION_UNKNOWN;
    mSinkBufferWidth = 0;
    mSinkBufferHeight = 0;
+    mFbFence = Fence::NO_FENCE;
    mOutputFence = Fence::NO_FENCE;
    mOutputProducerSlot = -1;
 }