summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jesse Hall <jessehall@google.com> 2014-01-28 18:24:10 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-01-28 18:24:10 +0000
commitade9a911d04dbd4bfbd3e80a917ea67a581b4797 (patch)
tree425af1624d86575b36d5e95a7354782eeec6adca
parent0da82a6f0d5b7f6466aa4622fc4cf1547f208499 (diff)
parentf65ebc3be4d3a2e4c71c401d0e53f2ad5798be2a (diff)
am f65ebc3b: am f5bcb391: Merge "SurfaceFlinger: mFbProducerSlot initailization"
* commit 'f65ebc3be4d3a2e4c71c401d0e53f2ad5798be2a': SurfaceFlinger: mFbProducerSlot initailization
-rw-r--r--services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp
index e203903418..d7fef8c1e1 100644
--- a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp
+++ b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp
@@ -461,6 +461,7 @@ void VirtualDisplaySurface::resetPerFrameState() {
mFbFence = Fence::NO_FENCE;
mOutputFence = Fence::NO_FENCE;
mOutputProducerSlot = -1;
+ mFbProducerSlot = -1;
}
status_t VirtualDisplaySurface::refreshOutputBuffer() {