commit a89c2d379e8f12a826ef9f27ececbafbc2461e29
author Emilian Peev <epeev@google.com> Tue Aug 28 12:24:48 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Aug 28 12:24:48 2018 -0700
tree bb916dd4817bca0055f0bf307398bdeb00b127c1
parent 94b543c03c4041f40c4254e5ee0f826eac954829
parent 75ceb36b27f17ae27cb0ad21e9860828a0bdbdd2

Merge "Camera: Don't hold 'mLock' when closing the camera session" into pie-vts-dev
am: 75ceb36b27

Change-Id: I3b3d8c2051dd89b0993bd17af77a6a19cd7792b6

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());
     }
 }