summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author John Reck <jreck@google.com> 2018-09-19 18:44:23 -0700
committer android-build-merger <android-build-merger@google.com> 2018-09-19 18:44:23 -0700
commit4b2de2ff174d1be152458cdc81e1d152b6a98f7d (patch)
tree62a88da08b4060946ac7e22415954f7cd9cb26fd
parente1a451833a243c52522950683785ab631a505d8e (diff)
parent21013eebd7f621fa130966b906558f72f0adec38 (diff)
Merge "Don't run comparisons on non-jank frames" am: 903dad812e am: 4007dd103f
am: 21013eebd7 Change-Id: Idf00d170ac8f1ab7a9c378c281b02ab5aa767ee1
-rw-r--r--libs/hwui/JankTracker.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/JankTracker.cpp b/libs/hwui/JankTracker.cpp
index e6d2a6f555ac..f2d50cd42523 100644
--- a/libs/hwui/JankTracker.cpp
+++ b/libs/hwui/JankTracker.cpp
@@ -146,7 +146,7 @@ void JankTracker::finishFrame(const FrameInfo& frame) {
frame[FrameInfoIndex::IntendedVsync] + mFrameInterval);
// If we hit the deadline, cool!
- if (frame[FrameInfoIndex::FrameCompleted] < mSwapDeadline) {
+ if (frame[FrameInfoIndex::FrameCompleted] < mSwapDeadline || totalDuration < mFrameInterval) {
if (isTripleBuffered) {
mData->reportJankType(JankType::kHighInputLatency);
(*mGlobalData)->reportJankType(JankType::kHighInputLatency);