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

Commit 8cfe8f7b authored by Shuzhen Wang's avatar Shuzhen Wang Committed by android-build-merger
Browse files

Merge "Camera: Filter out NIR cameras for camera1 API" into qt-r1-dev am: 1393a283 

am: 1a4916e1

Change-Id: I07c8aae1092a577882266e4147f6f0326693b95e
parents 25a6639d 1a4916e1

services/camera/libcameraservice/common/CameraProviderManager.cpp

+7 −0
Original line number Diff line number Diff line
@@ -2065,6 +2065,13 @@ status_t CameraProviderManager::ProviderInfo::DeviceInfo3::getCameraInfo( 
    return OK;

}

bool CameraProviderManager::ProviderInfo::DeviceInfo3::isAPI1Compatible() const {

    // Do not advertise NIR cameras to API1 camera app.

    camera_metadata_ro_entry cfa = mCameraCharacteristics.find(

            ANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT);

    if (cfa.count == 1 && cfa.data.u8[0] == ANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_NIR) {

        return false;

    }



    bool isBackwardCompatible = false;

    camera_metadata_ro_entry_t caps = mCameraCharacteristics.find(

            ANDROID_REQUEST_AVAILABLE_CAPABILITIES);