diff options
author | Eino-Ville Talvala <etalvala@google.com> | 2012-09-11 16:51:32 -0700 |
---|---|---|
committer | Eino-Ville Talvala <etalvala@google.com> | 2012-09-11 16:51:32 -0700 |
commit | b075252349a4b40ddda791f2e1221ae0ce7e4cd1 (patch) | |
tree | 361474f7746df1de6708d489e2adcfa83f1ebdde /services | |
parent | 14fe42d8d8d622f6fcdbd83df5f3932e24cd896e (diff) | |
download | frameworks_av-b075252349a4b40ddda791f2e1221ae0ce7e4cd1.zip frameworks_av-b075252349a4b40ddda791f2e1221ae0ce7e4cd1.tar.gz frameworks_av-b075252349a4b40ddda791f2e1221ae0ce7e4cd1.tar.bz2 |
Camera2: Configure ZSL at the right time.
ZSL enable was too early in the camera startup sequence, resulting it
being turned off most of the time.
Bug: 7148012
Change-Id: Ie144dd960d018a34b0bc77c88208ca22b7112772
Diffstat (limited to 'services')
-rw-r--r-- | services/camera/libcameraservice/Camera2Client.cpp | 9 | ||||
-rw-r--r-- | services/camera/libcameraservice/camera2/Parameters.cpp | 10 |
2 files changed, 9 insertions, 10 deletions
diff --git a/services/camera/libcameraservice/Camera2Client.cpp b/services/camera/libcameraservice/Camera2Client.cpp index 4237afb..eb72412 100644 --- a/services/camera/libcameraservice/Camera2Client.cpp +++ b/services/camera/libcameraservice/Camera2Client.cpp @@ -64,15 +64,6 @@ Camera2Client::Camera2Client(const sp<CameraService>& cameraService, SharedParameters::Lock l(mParameters); l.mParameters.state = Parameters::DISCONNECTED; - - char value[PROPERTY_VALUE_MAX]; - property_get("camera.zsl_mode", value, "0"); - if (!strcmp(value,"1")) { - ALOGI("Camera %d: Enabling ZSL mode", cameraId); - l.mParameters.zslMode = true; - } else { - l.mParameters.zslMode = false; - } } status_t Camera2Client::checkPid(const char* checkLocation) const { diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp index f490b2a..c07a6ac 100644 --- a/services/camera/libcameraservice/camera2/Parameters.cpp +++ b/services/camera/libcameraservice/camera2/Parameters.cpp @@ -23,6 +23,7 @@ #include <math.h> #include <stdlib.h> +#include <cutils/properties.h> #include "Parameters.h" #include "system/camera.h" @@ -748,7 +749,14 @@ status_t Parameters::initialize(const CameraMetadata *info) { previewCallbackFlags = 0; - zslMode = false; + char value[PROPERTY_VALUE_MAX]; + property_get("camera.zsl_mode", value, "0"); + if (!strcmp(value,"1")) { + ALOGI("Camera %d: Enabling ZSL mode", cameraId); + zslMode = true; + } else { + zslMode = false; + } lightFx = LIGHTFX_NONE; |