| commit | 5311547c0532704e1f6c664623acbfa65d10756b | [log] [tgz] |
|---|---|---|
| author | Yin-Chia Yeh <yinchiayeh@google.com> | Thu Jul 27 23:08:56 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 27 23:08:56 2017 +0000 |
| tree | 0fd6ae3f7bc98f1f52cf0a9d6a0faeeab3884796 | |
| parent | eba1407b55068f3fe5344b150f38cc0e33d47586 [diff] | |
| parent | fafbc479db0671fa27b94ec115dd3439623f47f5 [diff] |
Merge "Camera: fix various VTS issues" 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 da78258..a27fd66 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); } }