Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Revert Return ILLEGAL_ARGUMENT for setting null callback for 2.4 HAL" into main

Browse Source
This commit is contained in:
Tang Lee
2024-02-05 03:24:25 +00:00
committed by Android (Google) Code Review
parent 7bce2972f6 4e95fdd9a2
commit 78f804f2d3
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
camera/provider/2.4/default/ExternalCameraProviderImpl_2_4.cpp
View File

@@ -95,14 +95,13 @@ ExternalCameraProviderImpl_2_4::~ExternalCameraProviderImpl_2_4() {
Return<Status> ExternalCameraProviderImpl_2_4::setCallback(
const sp<ICameraProviderCallback>& 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) {

6
camera/provider/2.4/default/LegacyCameraProviderImpl_2_4.cpp
View File

@@ -448,11 +448,11 @@ bool LegacyCameraProviderImpl_2_4::setUpVendorTags() {
// Methods from ::android::hardware::camera::provider::V2_4::ICameraProvider follow.
Return<Status> LegacyCameraProviderImpl_2_4::setCallback(
const sp<ICameraProviderCallback>& 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);