diff options
| author | Zhijun He <zhijunhe@google.com> | 2013-10-16 18:02:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-16 18:02:14 -0700 |
| commit | d6c628f6db7e1b5079cb9a60cf84208891001ec4 (patch) | |
| tree | 63b0822af3070bf67bf4ab0e841c9d7165ab9750 /services | |
| parent | 771f1b6d196b7924707fc44177ac3a88fc31fa9e (diff) | |
| parent | dddafa84dcbd85c11a732e7553d0b884e5a08c27 (diff) | |
| download | frameworks_av-d6c628f6db7e1b5079cb9a60cf84208891001ec4.zip frameworks_av-d6c628f6db7e1b5079cb9a60cf84208891001ec4.tar.gz frameworks_av-d6c628f6db7e1b5079cb9a60cf84208891001ec4.tar.bz2 | |
am dddafa84: am 3defdab8: Merge "Camera: don\'t do hw support check for ZSL" into klp-dev
* commit 'dddafa84dcbd85c11a732e7553d0b884e5a08c27':
Camera: don't do hw support check for ZSL
Diffstat (limited to 'services')
| -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; |