commit 83f4904d51d324e74b6fd8af08c2d0b27f4029a6
author Yin-Chia Yeh <yinchiayeh@google.com> Tue Jul 11 13:44:35 2017 -0700
committer Yin-Chia Yeh <yinchiayeh@google.com> Thu Jul 20 12:05:21 2017 -0700
tree 58e7720a6f8001451dfe14b71f17ea9e230d3a26
parent 9071cc5bbce92303ae0fde4803b6f2c571342583

Camera: reset callback after test done

Test: VTS test pass
Bug: 63570734
Change-Id: Ia7b1e8e9baae2885d9c43821fe2933df883f7892
Merged-In: Ic0eecaf843b5c2e78f60325090ea652d43a74a0b

camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp

diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
index 2ae4853..9bffb1f 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);
     }
 }