| commit | 72ff9a1e3816b5b0ec924aacc493703def497133 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Aug 01 21:40:35 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Aug 01 21:40:35 2017 +0000 |
| tree | 6d83e2ed076dd587de82ca8f608e12dda5444c14 | |
| parent | 345a396c18e61ba587bdafb15fdafbe27e0f3c82 [diff] | |
| parent | 719d3fceb3908de3e20a12e2afc2fff8c192805e [diff] |
Merge "Camera: reset callback after test done" into oc-dev
diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp index 0d47f00..c0cd180 100644 --- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp +++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
@@ -1122,6 +1122,10 @@ auto status = provider.second->setCallback(cb); ASSERT_TRUE(status.isOk()); ASSERT_EQ(Status::OK, status); + // Reset callback since cb will go out of scope + status = provider.second->setCallback(nullptr); + ASSERT_TRUE(status.isOk()); + ASSERT_EQ(Status::OK, status); } }