commit 0e9bb861a7182078f6887d2cff394c72a9e6dc6c
author Changyeon Jo <changyeon@google.com> Fri Dec 11 01:16:38 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 11 01:16:38 2020 +0000
tree 6c4fc12bc6f6ba3833ea9e6298e1813735afe0ca
parent ff99be2e348c19732c1c5f6c12cded1a330c6375
parent cf0e945ac2a3014499613cc983e527d66e8cac73

Correct EVS VTS test case am: cf0e945ac2

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13195161

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14de6689ac73c5f3c72cdb0959dae5bee96f8280

automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp

diff --git a/automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp b/automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp
index 948d45f..f1c8f9f 100644
--- a/automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp
+++ b/automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp
@@ -305,11 +305,22 @@
             const auto id = 0xFFFFFFFF; // meaningless id
             hidl_vec<uint8_t> values;
             auto err = pCam->setExtendedInfo_1_1(id, values);
-            ASSERT_NE(EvsResult::INVALID_ARG, err);
+            if (isLogicalCam) {
+                // Logical camera device does not support setExtendedInfo
+                // method.
+                ASSERT_EQ(EvsResult::INVALID_ARG, err);
+            } else {
+                ASSERT_NE(EvsResult::INVALID_ARG, err);
+            }
 
-            pCam->getExtendedInfo_1_1(id, [](const auto& result, const auto& data) {
-                ASSERT_NE(EvsResult::INVALID_ARG, result);
-                ASSERT_EQ(0, data.size());
+
+            pCam->getExtendedInfo_1_1(id, [&isLogicalCam](const auto& result, const auto& data) {
+                if (isLogicalCam) {
+                    ASSERT_EQ(EvsResult::INVALID_ARG, result);
+                } else {
+                    ASSERT_NE(EvsResult::INVALID_ARG, result);
+                    ASSERT_EQ(0, data.size());
+                }
             });
 
             // Explicitly close the camera so resources are released right away