From 7793baab6738afcd9c5b7778f5ffa9ad5f2d7ec8 Mon Sep 17 00:00:00 2001 From: Changyeon Jo Date: Thu, 19 Jan 2023 13:18:47 -0800 Subject: [PATCH] Explicitly close the EVS display A test case closes the EVS display explicitly to make sure an associated EGL surface is destoryed before running a next test case. Fix: 266098494 Test: atest VtsHalEvsTargetTest Change-Id: I4079242884ed436bca95c983b3e4475f2cef1464 --- automotive/evs/aidl/vts/VtsHalEvsTargetTest.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/automotive/evs/aidl/vts/VtsHalEvsTargetTest.cpp b/automotive/evs/aidl/vts/VtsHalEvsTargetTest.cpp index 3cab204aec..2706c499ba 100644 --- a/automotive/evs/aidl/vts/VtsHalEvsTargetTest.cpp +++ b/automotive/evs/aidl/vts/VtsHalEvsTargetTest.cpp @@ -619,6 +619,7 @@ TEST_P(EvsAidlTest, CameraToDisplayRoundTrip) { getPhysicalCameraIds(cam.id, isLogicalCam); if (mIsHwModule && isLogicalCam) { LOG(INFO) << "Skip a logical device " << cam.id << " for HW target."; + ASSERT_TRUE(mEnumerator->closeDisplay(pDisplay).isOk()); continue; } @@ -1437,7 +1438,8 @@ TEST_P(EvsAidlTest, HighPriorityCameraClient) { ASSERT_TRUE(pCam1->getParameterList(&cam1Cmds).isOk()); if (cam0Cmds.size() < 1 || cam1Cmds.size() < 1) { // Cannot execute this test. - return; + ASSERT_TRUE(mEnumerator->closeDisplay(pDisplay).isOk()); + continue; } // Set up a frame receiver object which will fire up its own thread.