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

Commit 762e9737 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Camera:Remove manual_flash_strength_control flag." into main

parents 382dce0d a4ac6787

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

+10 −14
Original line number Diff line number Diff line
@@ -526,14 +526,12 @@ AidlProviderInfo::AidlDeviceInfo3::AidlDeviceInfo3( 
                __FUNCTION__, strerror(-res), res);

        return;

    }

    if (flags::camera_manual_flash_strength_control()) {

    res = fixupManualFlashStrengthControlTags(mCameraCharacteristics);

    if (OK != res) {

        ALOGE("%s: Unable to fix up manual flash strength control tags: %s (%d)",

                __FUNCTION__, strerror(-res), res);

        return;

    }

    }



    auto stat = addDynamicDepthTags();

    if (OK != stat) {
@@ -679,7 +677,6 @@ AidlProviderInfo::AidlDeviceInfo3::AidlDeviceInfo3( 
                        __FUNCTION__, strerror(-res), res);

            }



            if (flags::camera_manual_flash_strength_control()) {

            res = fixupManualFlashStrengthControlTags(mPhysicalCameraCharacteristics[id]);

            if (OK != res) {

                ALOGE("%s: Unable to fix up manual flash strength control tags: %s (%d)",
@@ -688,7 +685,6 @@ AidlProviderInfo::AidlDeviceInfo3::AidlDeviceInfo3( 
            }

        }

    }

    }



    int deviceVersion = HARDWARE_DEVICE_API_VERSION(mVersion.get_major(), mVersion.get_minor());

    if (deviceVersion >= CAMERA_DEVICE_API_VERSION_1_3) {

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

+11 −14
Original line number Diff line number Diff line
@@ -616,14 +616,13 @@ HidlProviderInfo::HidlDeviceInfo3::HidlDeviceInfo3( 
                __FUNCTION__, strerror(-res), res);

        return;

    }

    if (flags::camera_manual_flash_strength_control()) {



    res = fixupManualFlashStrengthControlTags(mCameraCharacteristics);

    if (OK != res) {

        ALOGE("%s: Unable to fix up manual flash strength control tags: %s (%d)",

                __FUNCTION__, strerror(-res), res);

        return;

    }

    }



    auto stat = addDynamicDepthTags();

    if (OK != stat) {
@@ -780,7 +779,6 @@ HidlProviderInfo::HidlDeviceInfo3::HidlDeviceInfo3( 
                        __FUNCTION__, strerror(-res), res);

            }



            if (flags::camera_manual_flash_strength_control()) {

            res = fixupManualFlashStrengthControlTags(mPhysicalCameraCharacteristics[id]);

            if (OK != res) {

                ALOGE("%s: Unable to fix up manual flash strength control tags: %s (%d)",
@@ -790,7 +788,6 @@ HidlProviderInfo::HidlDeviceInfo3::HidlDeviceInfo3( 
        }

    }

}

}



status_t HidlProviderInfo::HidlDeviceInfo3::setTorchMode(bool enabled) {

    using hardware::camera::common::V1_0::TorchMode;