Merge "Camera: don't do hw support check for ZSL" into klp-dev (3defdab8) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/api1/client2/Parameters.cpp

+5 −13

Original line number	Diff line number	Diff line
		@@ -817,13 +817,6 @@ status_t Parameters::initialize(const CameraMetadata *info) {
		previewCallbackOneShot = false;
		previewCallbackSurface = false;

		camera_metadata_ro_entry_t supportedHardwareLevel =
		staticInfo(ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL, 0, 0, false);
		if (!supportedHardwareLevel.count \|\| (supportedHardwareLevel.data.u8[0] ==
		ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED)) {
		ALOGI("Camera %d: ZSL mode disabled for limited mode HALs", cameraId);
		zslMode = false;
		} else {
		char value[PROPERTY_VALUE_MAX];
		property_get("camera.disable_zsl_mode", value, "0");
		if (!strcmp(value,"1")) {
		@@ -832,7 +825,6 @@ status_t Parameters::initialize(const CameraMetadata *info) {
		} else {
		zslMode = true;
		}
		}

		lightFx = LIGHTFX_NONE;