Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36518f8e authored by Shuzhen Wang's avatar Shuzhen Wang
Browse files

Revert "Camera VTS: Improve test for torch callback" 

This reverts commit f415f561.

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
parent fddcef05

camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp

+0 −16
Original line number Diff line number Diff line
@@ -387,22 +387,6 @@ TEST_P(CameraAidlTest, setTorchMode) { 
                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());

            {