summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilian Peev2018-06-07 11:49:26 -0500
committerEmilian Peev2018-06-07 12:21:25 -0500
commite0c4c497b3f21098f57c082b6cbf8b4f5fd72d36 (patch)
tree8db1be446f5907fc8d00e40c228a8e0074c06b81
parent0be954949ddf098fb9ab28c523b04aceeb575323 (diff)
downloadplatform-hardware-interfaces-e0c4c497b3f21098f57c082b6cbf8b4f5fd72d36.tar.gz
platform-hardware-interfaces-e0c4c497b3f21098f57c082b6cbf8b4f5fd72d36.tar.xz
platform-hardware-interfaces-e0c4c497b3f21098f57c082b6cbf8b4f5fd72d36.zip
Camera: Add only physical ids during multi-camera configuration
Per API specification "physicalCameraId" must not contain any logical camera ids. The test case should only use the physical ids it receives from the camera static metadata. Bug:109874630 Test:run vts --skip-all-system-status-check --skip-preconditions --primary-abi-only --module VtsHalCameraProviderV2_4Target -l INFO Change-Id: I82c5bf44f4572b3a6abdbb3101a11140907b1c9e
-rw-r--r--camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
index ff7c0ee8..95c7167c 100644
--- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
+++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
@@ -3480,11 +3480,10 @@ TEST_F(CameraHidlTest, processMultiCaptureRequestPreview) {
3480 ret = session->close(); 3480 ret = session->close();
3481 ASSERT_TRUE(ret.isOk()); 3481 ASSERT_TRUE(ret.isOk());
3482 3482
3483 // Leave only 2 physical devices in the id set.
3483 auto it = physicalIds.begin(); 3484 auto it = physicalIds.begin();
3484 string physicalDeviceId = *it; 3485 string physicalDeviceId = *it; it++;
3485 // Leave only the first physical device in the id set and insert the logical device.
3486 physicalIds.erase(++it, physicalIds.end()); 3486 physicalIds.erase(++it, physicalIds.end());
3487 physicalIds.emplace(deviceId);
3488 ASSERT_EQ(physicalIds.size(), 2u); 3487 ASSERT_EQ(physicalIds.size(), 2u);
3489 3488
3490 V3_4::HalStreamConfiguration halStreamConfig; 3489 V3_4::HalStreamConfiguration halStreamConfig;