commit ab7d1713098fa88cabfa413efe29758747ec8af4
author android-build-team Robot <android-build-team-robot@google.com> Tue Aug 21 03:01:17 2018
committer android-build-team Robot <android-build-team-robot@google.com> Tue Aug 21 03:01:17 2018
tree a0cc0ec023abe41dac25e644350d0a6d931448c9
parent a7c942d85351dd9beda8168c743e1233726aa19c
parent 3bd0729e59082167d2be3745080c8b3cc29b87ec

Snap for 4966094 from 3bd0729e59082167d2be3745080c8b3cc29b87ec to pi-qpr1-release

Change-Id: I18aa969ac2c3fb846c3f1b24f3bbd587ee4c3553

modules/egl/teglGetFrameTimestampsTests.cpp

diff --git a/modules/egl/teglGetFrameTimestampsTests.cpp b/modules/egl/teglGetFrameTimestampsTests.cpp
index 642262d..3c0c02f 100644
--- a/modules/egl/teglGetFrameTimestampsTests.cpp
+++ b/modules/egl/teglGetFrameTimestampsTests.cpp
@@ -263,7 +263,8 @@
 	check_lt(result, frame1.dequeueReady, frame2.dequeueReady, "Dequeue ready times not monotonic.");
 
 	// GPU timeline.
-	check_lt(result, frame1.renderingComplete, frame2.renderingComplete, "Rendering complete times not monotonic.");
+	// Same rendering complete time is fine.
+	check_le(result, frame1.renderingComplete, frame2.renderingComplete, "Rendering complete times not monotonic.");
 
 	if (timestampValid(frame1.firstCompositionGpuFinished) && timestampValid(frame2.firstCompositionGpuFinished))
 		check_lt(result, frame1.firstCompositionGpuFinished, frame2.firstCompositionGpuFinished, "Composition GPU work complete times not monotonic.");