Merge "Camera: Filter out NIR cameras for camera1 API" into qt-r1-dev (1a4916e1) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/common/CameraProviderManager.cpp

+7 −0

Original line number	Diff line number	Diff line
		@@ -2058,6 +2058,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);