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

Commit b852e79b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Camera: VNDK: Fix deferred endConfigure due to missing sessionParam"

parents 3989f649 639ed120

camera/ndk/ndk_vendor/impl/ACameraDevice.cpp

+1 −1
Original line number Diff line number Diff line
@@ -754,8 +754,8 @@ CameraDevice::configureStreamsLocked(const ACaptureSessionOutputContainer* outpu 
        const camera_metadata_t *params_metadata = params.getAndLock();

        utils::convertToHidl(params_metadata, &hidlParams);

        params.unlock(params_metadata);

        remoteRet = mRemote->endConfigure(StreamConfigurationMode::NORMAL_MODE, hidlParams);

    }

    remoteRet = mRemote->endConfigure(StreamConfigurationMode::NORMAL_MODE, hidlParams);

    if (!remoteRet.isOk()) {

        ALOGE("Transaction error: endConfigure failed %s", remoteRet.description().c_str());

    }

services/camera/libcameraservice/hidl/Convert.cpp

+8 −6
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ hardware::camera2::params::OutputConfiguration convertFromHidl( 
bool convertFromHidl(const HCameraMetadata &src, CameraMetadata *dst) {

    const camera_metadata_t *buffer = reinterpret_cast<const camera_metadata_t*>(src.data());

    size_t expectedSize = src.size();

    if (buffer != nullptr) {

        int res = validate_camera_metadata_structure(buffer, &expectedSize);

        if (res == OK || res == CAMERA_METADATA_VALIDATION_SHIFTED) {

            *dst = buffer;
@@ -108,6 +109,7 @@ bool convertFromHidl(const HCameraMetadata &src, CameraMetadata *dst) { 
            ALOGE("%s: Malformed camera metadata received from HAL", __FUNCTION__);

            return false;

        }

    }

    return true;

}