summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2016-08-08 14:52:04 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-08-08 14:52:05 +0000
commit295d81c360ff56554b6c8c1adc0f9e2a38eca67c (patch)
tree3dfccbaba20a577ed9de96798bb69b0d17e1e8ec /libs
parent867f6d5dd544f995036f11bf56c869e50f447263 (diff)
parent70e89c9c376bf5bb20498c5c952cf665b2cd7375 (diff)
downloadandroid-frameworks-base-295d81c360ff56554b6c8c1adc0f9e2a38eca67c.tar.gz
android-frameworks-base-295d81c360ff56554b6c8c1adc0f9e2a38eca67c.tar.xz
Merge "Ensure Dequeue/Queue duration is always set" into nyc-mr1-dev
Diffstat (limited to 'libs')
-rw-r--r--libs/hwui/renderthread/CanvasContext.cpp3
1 files changed, 3 insertions, 0 deletions
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 @@ void CanvasContext::draw() {
= swap.queueDuration;
mHaveNewSurface = false;
mFrameNumber = -1;
+ } else {
+ mCurrentFrameInfo->set(FrameInfoIndex::DequeueBufferDuration) = 0;
+ mCurrentFrameInfo->set(FrameInfoIndex::QueueBufferDuration) = 0;
}
// TODO: Use a fence for real completion?