summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2012-09-17 16:57:27 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-18 13:34:51 -0700
commita2acc96eadc02228b8a3366de3d05d3a6a81272c (patch)
tree8400fcb2be495591d0d83edd9268bfc18aa82703 /services/camera/libcameraservice
parenta80773ba36872943713d76c8485bed12ddc53499 (diff)
downloadframeworks_av-a2acc96eadc02228b8a3366de3d05d3a6a81272c.zip
frameworks_av-a2acc96eadc02228b8a3366de3d05d3a6a81272c.tar.gz
frameworks_av-a2acc96eadc02228b8a3366de3d05d3a6a81272c.tar.bz2
Camera2: Enable ZSL by default.
Bug: 6910087 Change-Id: Ie774f28fbb943b2ac2c856872fd4cae68b40430c
Diffstat (limited to 'services/camera/libcameraservice')
-rw-r--r--services/camera/libcameraservice/camera2/Parameters.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp
index c6d7747..0a72c5f 100644
--- a/services/camera/libcameraservice/camera2/Parameters.cpp
+++ b/services/camera/libcameraservice/camera2/Parameters.cpp
@@ -750,12 +750,12 @@ status_t Parameters::initialize(const CameraMetadata *info) {
previewCallbackFlags = 0;
char value[PROPERTY_VALUE_MAX];
- property_get("camera.zsl_mode", value, "0");
+ property_get("camera.disable_zsl_mode", value, "0");
if (!strcmp(value,"1")) {
- ALOGI("Camera %d: Enabling ZSL mode", cameraId);
- zslMode = true;
- } else {
+ ALOGI("Camera %d: Disabling ZSL mode", cameraId);
zslMode = false;
+ } else {
+ zslMode = true;
}
lightFx = LIGHTFX_NONE;