commit 6277952f305b2b0fd7562027c1c553f869cdaa40
author Yin-Chia Yeh <yinchiayeh@google.com> Wed Jul 26 21:36:53 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jul 26 21:36:53 2017 +0000
tree 8ad4ad84010143ecae7a064fef6a16bd46bd6c30
parent d9cdb2181dd538d04503ebaeca87cae7803db513
parent eba1407b55068f3fe5344b150f38cc0e33d47586

Merge "Camera: reset callback after test done" into oc-dr1-dev
am: eba1407b55

Change-Id: I2ab3b17ad9a0b4893a31d5c50f65ccf72d43c315

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 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);
     }
 }