diff options
| author | Zhijun He <zhijunhe@google.com> | 2013-10-16 22:47:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-16 22:47:48 +0000 |
| commit | 3defdab829de7df3a343393b2b277e99d071744c (patch) | |
| tree | 77a6e3009e89a42e78e041b56a9c69efd3e462f1 | |
| parent | 120a88471a607c85c4d60300d73c3be0a1e8f8c8 (diff) | |
| parent | afada1e56cf0f91be5e44678850fcead2a70cca2 (diff) | |
| download | frameworks_av-3defdab829de7df3a343393b2b277e99d071744c.zip frameworks_av-3defdab829de7df3a343393b2b277e99d071744c.tar.gz frameworks_av-3defdab829de7df3a343393b2b277e99d071744c.tar.bz2 | |
Merge "Camera: don't do hw support check for ZSL" into klp-dev
| -rw-r--r-- | services/camera/libcameraservice/api1/client2/Parameters.cpp | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/services/camera/libcameraservice/api1/client2/Parameters.cpp b/services/camera/libcameraservice/api1/client2/Parameters.cpp index 9317aa3..8a4e75c 100644 --- a/services/camera/libcameraservice/api1/client2/Parameters.cpp +++ b/services/camera/libcameraservice/api1/client2/Parameters.cpp @@ -817,21 +817,13 @@ 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); + char value[PROPERTY_VALUE_MAX]; + property_get("camera.disable_zsl_mode", value, "0"); + if (!strcmp(value,"1")) { + ALOGI("Camera %d: Disabling ZSL mode", cameraId); zslMode = false; } else { - char value[PROPERTY_VALUE_MAX]; - property_get("camera.disable_zsl_mode", value, "0"); - if (!strcmp(value,"1")) { - ALOGI("Camera %d: Disabling ZSL mode", cameraId); - zslMode = false; - } else { - zslMode = true; - } + zslMode = true; } lightFx = LIGHTFX_NONE; |