| commit | e31ea3ab65d3233ac856afeb09d108ab698840f2 | [log] [tgz] |
|---|---|---|
| author | Yin-Chia Yeh <yinchiayeh@google.com> | Tue Aug 01 22:05:24 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 01 22:05:24 2017 +0000 |
| tree | 04268f9d1b706c01373829a43cdfa3f66fbfbdf2 | |
| parent | 140b84b377ecadc4631190a30015eb0ce7d9cf62 [diff] | |
| parent | 72ff9a1e3816b5b0ec924aacc493703def497133 [diff] |
Merge "Camera: reset callback after test done" into oc-dev am: 72ff9a1e38 Change-Id: I194688afcf1143f7ac40416150986cd8e4ad02aa
diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp index cc777c0..0fc53e2 100644 --- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp +++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
@@ -1123,6 +1123,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); } }