commit 8303aca7292099cd9385694cfc4133e06ad6613f
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jun 07 21:49:07 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 07 21:49:07 2018 +0000
tree 1296c392f0dd7944433ba63ed01037fc3947999b
parent e0c4c497b3f21098f57c082b6cbf8b4f5fd72d36
parent 147ec3007642dc2403c845022708789a7972687d

Merge "secure_element: vts: Fix openBasicChannel and transmit test case" into pi-dev

camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp

diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
index ff7c0ee..95c7167 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 @@
         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;