commit 295d81c360ff56554b6c8c1adc0f9e2a38eca67c
author John Reck <jreck@google.com> Mon Aug 08 14:52:04 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 08 14:52:05 2016 +0000
tree 3dfccbaba20a577ed9de96798bb69b0d17e1e8ec
parent 867f6d5dd544f995036f11bf56c869e50f447263
parent 70e89c9c376bf5bb20498c5c952cf665b2cd7375

Merge "Ensure Dequeue/Queue duration is always set" into nyc-mr1-dev

libs/hwui/renderthread/CanvasContext.cpp

diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index dafe1d1..dcaec42 100644
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -578,6 +578,9 @@
                 = swap.queueDuration;
         mHaveNewSurface = false;
         mFrameNumber = -1;
+    } else {
+        mCurrentFrameInfo->set(FrameInfoIndex::DequeueBufferDuration) = 0;
+        mCurrentFrameInfo->set(FrameInfoIndex::QueueBufferDuration) = 0;
     }
 
     // TODO: Use a fence for real completion?