| commit | db11779c7e0f8b369cbd7b26a8de829b77580a7e | [log] [tgz] |
|---|---|---|
| author | Yin-Chia Yeh <yinchiayeh@google.com> | Thu Jul 27 22:14:31 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 27 22:14:31 2017 +0000 |
| tree | 36b4742af86bb569bdc221c4973ff3768b5ad9f2 | |
| parent | 12dfe7d2ce870437d57dd23eef251a2eb159a3b9 [diff] | |
| parent | d17bb31a0d3e0ec7dcf8005096fa70b7ba40e845 [diff] |
Merge "Camera: reset callback after test done" into oc-mr1-dev am: d17bb31a0d Change-Id: Ib7a08d2f8a403dfffe6930a7761579fdb1fa39d4
diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp index f720303..c9f03b0 100644 --- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp +++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
@@ -1084,6 +1084,9 @@ auto status = mProvider->setCallback(cb); ASSERT_TRUE(status.isOk()); ASSERT_EQ(Status::OK, status); + status = mProvider->setCallback(nullptr); + ASSERT_TRUE(status.isOk()); + ASSERT_EQ(Status::OK, status); } // Test if ICameraProvider::getCameraDeviceInterface returns Status::OK and non-null device