diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2020-12-12 00:11:19 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-12-12 00:11:19 +0000 |
commit | 8bd379069ba1df119a3e4c817f5fa8869a8c93c9 (patch) | |
tree | 17d794df23bed5909122c1d059846fca9a5de4cc | |
parent | b856138291b2f09de9624b101225487c03ef9315 (diff) | |
parent | cf0e945ac2a3014499613cc983e527d66e8cac73 (diff) | |
download | platform_hardware_interfaces-8bd379069ba1df119a3e4c817f5fa8869a8c93c9.tar.gz platform_hardware_interfaces-8bd379069ba1df119a3e4c817f5fa8869a8c93c9.tar.bz2 platform_hardware_interfaces-8bd379069ba1df119a3e4c817f5fa8869a8c93c9.zip |
Snap for 7028231 from cf0e945ac2a3014499613cc983e527d66e8cac73 to rvc-qpr2-releaseandroid-11.0.0_r33android-11.0.0_r32
Change-Id: If4b6c0ebd829500271c6d24f832740b281d8806a
-rw-r--r-- | automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp b/automotive/evs/1.1/vts/functional/VtsHalEvsV1_1TargetTest.cpp index 948d45ff85..f1c8f9f6c7 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 @@ TEST_P(EvsHidlTest, CameraOpenClean) { 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 |