| commit | eba1407b55068f3fe5344b150f38cc0e33d47586 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Jul 26 21:28:45 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jul 26 21:28:45 2017 +0000 |
| tree | aa224e774c23b0ad2ba4a59f6948fb2a5348a009 | |
| parent | 6bba7c9ca489c8812fb8a0ec11131b137728f305 [diff] | |
| parent | 83f4904d51d324e74b6fd8af08c2d0b27f4029a6 [diff] |
Merge "Camera: reset callback after test done" into oc-dr1-dev
diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp index e078614..35df042 100644 --- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp +++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
@@ -1111,6 +1111,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); } }