From 4e95fdd9a226e3335d4019c0caa61b4f4ced57e3 Mon Sep 17 00:00:00 2001 From: Tang Lee Date: Fri, 2 Feb 2024 15:53:03 +0800 Subject: [PATCH] Revert Return ILLEGAL_ARGUMENT for setting null callback for 2.4 HAL This reverts part of the CL(ag/24741349) on 2.4 HAL file to pass 2.4 VTS. Since ag/24741349 was just for passing latest VTS on default HAL, it's ok to keep 2.4 HAL aligned with 2.4's VTS case. Bug: 320925606 Test: none Change-Id: I3c5e34930925c466ef6be4209e49122af1c791f6 --- .../2.4/default/ExternalCameraProviderImpl_2_4.cpp | 7 +++---- .../provider/2.4/default/LegacyCameraProviderImpl_2_4.cpp | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/camera/provider/2.4/default/ExternalCameraProviderImpl_2_4.cpp b/camera/provider/2.4/default/ExternalCameraProviderImpl_2_4.cpp index 2d919cccff..bb7679519a 100644 --- a/camera/provider/2.4/default/ExternalCameraProviderImpl_2_4.cpp +++ b/camera/provider/2.4/default/ExternalCameraProviderImpl_2_4.cpp @@ -95,14 +95,13 @@ ExternalCameraProviderImpl_2_4::~ExternalCameraProviderImpl_2_4() { Return ExternalCameraProviderImpl_2_4::setCallback( const sp& callback) { - if (callback == nullptr) { - return Status::ILLEGAL_ARGUMENT; - } - { Mutex::Autolock _l(mLock); mCallbacks = callback; } + if (callback == nullptr) { + return Status::OK; + } // Send a callback for all devices to initialize { for (const auto& pair : mCameraStatusMap) { diff --git a/camera/provider/2.4/default/LegacyCameraProviderImpl_2_4.cpp b/camera/provider/2.4/default/LegacyCameraProviderImpl_2_4.cpp index 07ed689c98..f039644575 100644 --- a/camera/provider/2.4/default/LegacyCameraProviderImpl_2_4.cpp +++ b/camera/provider/2.4/default/LegacyCameraProviderImpl_2_4.cpp @@ -448,11 +448,11 @@ bool LegacyCameraProviderImpl_2_4::setUpVendorTags() { // Methods from ::android::hardware::camera::provider::V2_4::ICameraProvider follow. Return LegacyCameraProviderImpl_2_4::setCallback( const sp& callback) { - if (callback == nullptr) { - return Status::ILLEGAL_ARGUMENT; - } Mutex::Autolock _l(mCbLock); mCallbacks = callback; + if (callback == nullptr) { + return Status::OK; + } // Add and report all presenting external cameras. for (auto const& statusPair : mCameraStatusMap) { int id = std::stoi(statusPair.first);