From e0c4c497b3f21098f57c082b6cbf8b4f5fd72d36 Mon Sep 17 00:00:00 2001 From: Emilian Peev Date: Thu, 7 Jun 2018 17:49:26 +0100 Subject: [PATCH] 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 --- .../vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp | 5 ++--- 1 file 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 ff7c0ee862..95c7167c3b 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) { ret = session->close(); ASSERT_TRUE(ret.isOk()); + // Leave only 2 physical devices in the id set. auto it = physicalIds.begin(); - string physicalDeviceId = *it; - // Leave only the first physical device in the id set and insert the logical device. + string physicalDeviceId = *it; it++; physicalIds.erase(++it, physicalIds.end()); - physicalIds.emplace(deviceId); ASSERT_EQ(physicalIds.size(), 2u); V3_4::HalStreamConfiguration halStreamConfig;