To prevent power side effect from legacy platform. We tend to relax the
deqp criteria from 3 vsyncs to 4 vsyncs. And verify timestamp 6 frames
ago.

BUG: 123203074
Change-Id: I214b410d2ab8f0d6d4b3f9d6752c1c1d756cc28f
diff --git a/modules/egl/teglGetFrameTimestampsTests.cpp b/modules/egl/teglGetFrameTimestampsTests.cpp
index 3c0c02f..f369e83 100644
--- a/modules/egl/teglGetFrameTimestampsTests.cpp
+++ b/modules/egl/teglGetFrameTimestampsTests.cpp
@@ -636,7 +636,7 @@
 			check_lt<EGLnsecsANDROID>(m_result, 1000000, frame.compositeInterval, "Reported refresh rate greater than 1kHz.");
 			check_lt<EGLnsecsANDROID>(m_result, frame.compositeInterval, 1000000000, "Reported refresh rate less than 1Hz.");
 			check_lt<EGLnsecsANDROID>(m_result, 0, frame.compositeToPresentLatency, "Composite to present latency must be greater than 0.");
-			check_lt(m_result, frame.compositeToPresentLatency, frame.compositeInterval * 3, "Composite to present latency is more than 3 vsyncs.");
+			check_lt(m_result, frame.compositeToPresentLatency, frame.compositeInterval * 4, "Composite to present latency is more than 4 vsyncs.");
 			const EGLnsecsANDROID minDeadline = now;
 			check_lt(m_result, minDeadline, frame.compositeDeadline, "Next composite deadline is in the past.");
 			const EGLnsecsANDROID maxDeadline = now + frame.compositeInterval * 2;
@@ -655,25 +655,25 @@
 			frame.swapBufferBeginNs = getNanoseconds();
 			EGLU_CHECK_CALL(egl, swapBuffers(display, *surface));
 
-			// All timestamps from 5 frames ago should definitely be available.
-			const size_t frameDelay = 5;
+			// All timestamps from 6 frames ago should definitely be available.
+			const size_t frameDelay = 6;
 			if (i >= frameDelay)
 			{
 				// \todo [2017-01-25 brianderson] Remove this work around once reads done is fixed.
 				const bool verifyReadsDone	=	i > (frameDelay + 3);
-				FrameTimes&		frame5ago	=	frameTimes[i-frameDelay];
+				FrameTimes&		frame6ago	=	frameTimes[i-frameDelay];
 				std::vector<EGLnsecsANDROID> supportedValues(supportedNames.size(), 0);
 
 				CHECK_NAKED_EGL_CALL(egl, m_eglGetFrameTimestampsANDROID(
-					display, *surface, frame5ago.frameId, static_cast<eglw::EGLint>(supportedNames.size()),
+					display, *surface, frame6ago.frameId, static_cast<eglw::EGLint>(supportedNames.size()),
 					&supportedNames[0], &supportedValues[0]));
-				populateFrameTimes(&frame5ago, timestamps, supportedValues);
+				populateFrameTimes(&frame6ago, timestamps, supportedValues);
 
-				verifySingleFrame(frame5ago, m_result, verifyReadsDone);
+				verifySingleFrame(frame6ago, m_result, verifyReadsDone);
 				if (i >= frameDelay + 1)
 				{
-					FrameTimes& frame6ago = frameTimes[i-frameDelay-1];
-					verifyNeighboringFrames(frame6ago, frame5ago, m_result);
+					FrameTimes& frame7ago = frameTimes[i-frameDelay-1];
+					verifyNeighboringFrames(frame7ago, frame6ago, m_result);
 				}
 			}
 		}