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

Commit 62625d3d authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Android (Google) Code Review
Browse files

Merge "Camera: Remove code for feature_combination_query" into main

parents 7c80ea14 14275431

camera/camera2/SessionConfiguration.cpp

+15 −21
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ status_t SessionConfiguration::readFromParcel(const android::Parcel* parcel) { 


    bool hasSessionParameters = false;

    CameraMetadata settings;

    if (flags::feature_combination_query()) {

    if ((err = parcel->readBool(&hasSessionParameters)) != OK) {

        ALOGE("%s: Failed to read hasSessionParameters flag from parcel", __FUNCTION__);

        return err;
@@ -84,7 +83,6 @@ status_t SessionConfiguration::readFromParcel(const android::Parcel* parcel) { 
            return err;

        }

    }

    }



    mOperatingMode = operatingMode;

    mInputWidth = inputWidth;
@@ -94,10 +92,8 @@ status_t SessionConfiguration::readFromParcel(const android::Parcel* parcel) { 
    for (auto& stream : outputStreams) {

        mOutputStreams.push_back(stream);

    }

    if (flags::feature_combination_query()) {

    mHasSessionParameters = hasSessionParameters;

    mSessionParameters = std::move(settings);

    }



    return err;

}
@@ -125,7 +121,6 @@ status_t SessionConfiguration::writeToParcel(android::Parcel* parcel) const { 
    err = parcel->writeParcelableVector(mOutputStreams);

    if (err != OK) return err;



    if (flags::feature_combination_query()) {

    err = parcel->writeBool(mHasSessionParameters);

    if (err != OK) return err;
@@ -133,7 +128,6 @@ status_t SessionConfiguration::writeToParcel(android::Parcel* parcel) const { 
        err = mSessionParameters.writeToParcel(parcel);

        if (err != OK) return err;

    }

    }



    return OK;

}

services/camera/libcameraservice/CameraService.cpp

+0 −8
Original line number Diff line number Diff line
@@ -828,10 +828,6 @@ Status CameraService::createDefaultRequest(const std::string& unresolvedCameraId 
        hardware::camera2::impl::CameraMetadataNative* request) {

    ATRACE_CALL();



    if (!flags::feature_combination_query()) {

        return STATUS_ERROR(CameraService::ERROR_INVALID_OPERATION,

                "Camera subsystem doesn't support this method!");

    }

    if (!mInitialized) {

        ALOGE("%s: Camera subsystem is not available", __FUNCTION__);

        logServiceError("Camera subsystem is not available", ERROR_DISCONNECTED);
@@ -891,10 +887,6 @@ Status CameraService::isSessionConfigurationWithParametersSupported( 
        /*out*/ bool* supported) {

    ATRACE_CALL();



    if (!flags::feature_combination_query()) {

        return STATUS_ERROR(CameraService::ERROR_INVALID_OPERATION,

                "Camera subsystem doesn't support this method!");

    }

    if (!mInitialized) {

        ALOGE("%s: Camera HAL couldn't be initialized", __FUNCTION__);

        logServiceError("Camera subsystem is not available", ERROR_DISCONNECTED);

services/camera/libcameraservice/common/aidl/AidlProviderInfo.cpp

+5 −15
Original line number Diff line number Diff line
@@ -622,13 +622,11 @@ AidlProviderInfo::AidlDeviceInfo3::AidlDeviceInfo3( 
        mHasFlashUnit = false;

    }



    if (flags::feature_combination_query()) {

    res = addSessionConfigQueryVersionTag();

    if (OK != res) {

        ALOGE("%s: Unable to add sessionConfigurationQueryVersion tag: %s (%d)",

                __FUNCTION__, strerror(-res), res);

    }

    }



    camera_metadata_entry entry =

            mCameraCharacteristics.find(ANDROID_FLASH_INFO_STRENGTH_DEFAULT_LEVEL);
@@ -844,11 +842,7 @@ status_t AidlProviderInfo::AidlDeviceInfo3::isSessionConfigurationSupported( 
                    mVersion.get_minor());

            return INVALID_OPERATION;

        }

        if (flags::feature_combination_query()) {

        ret = interface->isStreamCombinationWithSettingsSupported(streamConfiguration, status);

        } else {

            return INVALID_OPERATION;

        }

    } else {

        ret = interface->isStreamCombinationSupported(streamConfiguration, status);

    }
@@ -887,10 +881,6 @@ status_t AidlProviderInfo::AidlDeviceInfo3::createDefaultRequest( 
        return res;

    }



    if (!flags::feature_combination_query()) {

        return INVALID_OPERATION;

    }



    auto err = interface->constructDefaultRequestSettings(id, &request);

    if (!err.isOk()) {

        ALOGE("%s: Transaction error: %s", __FUNCTION__, err.getMessage());

services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp

+4 −6
Original line number Diff line number Diff line
@@ -693,13 +693,11 @@ HidlProviderInfo::HidlDeviceInfo3::HidlDeviceInfo3( 
        mHasFlashUnit = false;

    }



    if (flags::feature_combination_query()) {

    res = addSessionConfigQueryVersionTag();

    if (OK != res) {

        ALOGE("%s: Unable to add sessionConfigurationQueryVersion tag: %s (%d)",

                __FUNCTION__, strerror(-res), res);

    }

    }



    camera_metadata_entry entry =

            mCameraCharacteristics.find(ANDROID_FLASH_INFO_STRENGTH_DEFAULT_LEVEL);