commit 467113c6fcb1f4714d84d6d097c5525ae0130d00
author Jesse Hall <jessehall@google.com> Sun Jan 26 16:50:36 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sun Jan 26 16:50:36 2014 +0000
tree d308457ce043811546f8aa5f6d34eb3db1364505
parent 8b7cc0aeb7559db3241d19aa6c93883ca991a784
parent 25f75c361098086ffa2b87dcc3f22ac5f64c05be

am 25f75c36: am 8c303f7e: am fcf9c1ba: Merge "SurfaceFlinger: mFbFence initialization"

* commit '25f75c361098086ffa2b87dcc3f22ac5f64c05be':
  SurfaceFlinger: mFbFence initialization

services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp

diff --git a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp
index be5cf4a..e203903 100644
--- a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp
+++ b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp
@@ -458,6 +458,7 @@
     mCompositionType = COMPOSITION_UNKNOWN;
     mSinkBufferWidth = 0;
     mSinkBufferHeight = 0;
+    mFbFence = Fence::NO_FENCE;
     mOutputFence = Fence::NO_FENCE;
     mOutputProducerSlot = -1;
 }