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

Commit 78f804f2 authored by Tang Lee's avatar Tang Lee Committed by Android (Google) Code Review
Browse files

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

parents 7bce2972 4e95fdd9

camera/provider/2.4/default/ExternalCameraProviderImpl_2_4.cpp

+3 −4
Original line number Diff line number Diff line
@@ -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) {

camera/provider/2.4/default/LegacyCameraProviderImpl_2_4.cpp

+3 −3
Original line number Diff line number Diff line
@@ -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);