Merge cherrypicks of ['googleplex-android-review.googlesource.com/23847410'] into udc-release.android-vts-14.0_r1android-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-platform-14.0.0_r7android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r1android-14.0.0_r28android-14.0.0_r2android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r1android14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-platform-release

Change-Id: Ib670d2e86ea5b8542fee7f49540b07c36513a470

1 files changed, 2 insertions, 0 deletions

diff --git a/external/vulkancts/modules/vulkan/wsi/vktWsiColorSpaceTests.cpp b/external/vulkancts/modules/vulkan/wsi/vktWsiColorSpaceTests.cpp
index 12d523258..84145d83a 100644
--- a/external/vulkancts/modules/vulkan/wsi/vktWsiColorSpaceTests.cpp
+++ b/external/vulkancts/modules/vulkan/wsi/vktWsiColorSpaceTests.cpp
@@ -781,6 +781,7 @@ tcu::TestStatus surfaceFormatRenderTests (Context& context, Type wsiType)
 	for (vector<VkSurfaceFormatKHR>::const_iterator curFmt = formats.begin(); curFmt != formats.end(); ++curFmt)
 	{
 		surfaceFormatRenderTest(context, wsiType, instHelper, devHelper, *surface, *curFmt);
+		context.getTestContext().touchWatchdog();
 	}
 	return tcu::TestStatus::pass("Rendering tests succeeded");
 }
@@ -802,6 +803,7 @@ tcu::TestStatus surfaceFormatRenderWithHdrTests (Context& context, Type wsiType)
 	for (vector<VkSurfaceFormatKHR>::const_iterator curFmt = formats.begin(); curFmt != formats.end(); ++curFmt)
 	{
 		surfaceFormatRenderTest(context, wsiType, instHelper, devHelper, *surface, *curFmt, true);
+		context.getTestContext().touchWatchdog();
 	}
 	return tcu::TestStatus::pass("Rendering tests succeeded");
 }