commit 75ceb36b27f17ae27cb0ad21e9860828a0bdbdd2
author Treehugger Robot <treehugger-gerrit@google.com> Tue Aug 28 19:11:28 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 28 19:11:28 2018 +0000
tree 05682d32a2036704945dfa69e7538a111d7a945a
parent b3e86d489a5f5d1520837f377257adfa33290894
parent 6fa94395fdb7db15f622c6f5d4bbd0eb0fb490b1

Merge "Camera: Don't hold 'mLock' when closing the camera session" into pie-vts-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 0d92c37..c6c00d2 100644
--- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
+++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
@@ -4044,10 +4044,10 @@
                                << static_cast<uint32_t>(inflightReq.errorCode);
                 }
             }
-
-            ret = session->close();
-            ASSERT_TRUE(ret.isOk());
         }
+
+        ret = session->close();
+        ASSERT_TRUE(ret.isOk());
     }
 }