Merge "camera3: Disable ZSL for limited mode camera HALs" into jb-mr2-dev (6947f125) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/camera2/Parameters.cpp

+13 −5

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

		camera_metadata_ro_entry_t supportedHardwareLevel =
		staticInfo(ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL);
		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")) {
		@@ -803,6 +810,7 @@ status_t Parameters::initialize(const CameraMetadata *info) {
		} else {
		zslMode = true;
		}
		}

		lightFx = LIGHTFX_NONE;