Revert "Camera VTS: Improve test for torch callback"
This reverts commit f415f561a8925aa5a317adbf8f6f62664bb867b9.
Current HAL assumes that no new setCallback() is called after the start
of camera provider. Having more than one callback listeners breaks that
implicit assumption. It may not be trivial for HAL to add support for
multiple callback listeners
Test: CameraAidlTest#setTorchMode passes
Bug: 251111588
Change-Id: Idd2a250dc325b1a1080c1fa6562507e563cf545c
diff --git a/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp b/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp
index 557061a..017f6ef 100644
--- a/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp
+++ b/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp
@@ -387,22 +387,6 @@
mTorchStatus = TorchModeStatus::NOT_AVAILABLE;
}
- // register a new callback; make sure it receives the
- // flash-on callback.
- std::shared_ptr<TorchProviderCb> cb2 = ndk::SharedRefBase::make<TorchProviderCb>(this);
- ret = mProvider->setCallback(cb2);
- ASSERT_TRUE(ret.isOk());
- ASSERT_NE(cb2, nullptr);
- {
- std::unique_lock<std::mutex> l(mTorchLock);
- while (TorchModeStatus::NOT_AVAILABLE == mTorchStatus) {
- auto timeout = std::chrono::system_clock::now() +
- std::chrono::seconds(kTorchTimeoutSec);
- ASSERT_NE(std::cv_status::timeout, mTorchCond.wait_until(l, timeout));
- }
- ASSERT_EQ(TorchModeStatus::AVAILABLE_ON, mTorchStatus);
- }
-
ret = device->setTorchMode(false);
ASSERT_TRUE(ret.isOk());
{