diff options
| author | Ed Heyl <edheyl@google.com> | 2013-05-23 22:17:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-23 22:17:51 -0700 |
| commit | 14e585c8e0667c13202dbefc52f9d00ffe161cf1 (patch) | |
| tree | 8701fcc8d41fceae8da02afd17b4bd6f408120d0 /services | |
| parent | 9b89c15d9d8abb9408760ffdb022df4c4367685b (diff) | |
| parent | 6947f125f76dde6664779126415d11b3365225da (diff) | |
| download | frameworks_av-14e585c8e0667c13202dbefc52f9d00ffe161cf1.zip frameworks_av-14e585c8e0667c13202dbefc52f9d00ffe161cf1.tar.gz frameworks_av-14e585c8e0667c13202dbefc52f9d00ffe161cf1.tar.bz2 | |
am 6947f125: Merge "camera3: Disable ZSL for limited mode camera HALs" into jb-mr2-dev
* commit '6947f125f76dde6664779126415d11b3365225da':
camera3: Disable ZSL for limited mode camera HALs
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/camera2/Parameters.cpp | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp index 49fc3d8..a248b76 100644 --- a/services/camera/libcameraservice/camera2/Parameters.cpp +++ b/services/camera/libcameraservice/camera2/Parameters.cpp @@ -795,13 +795,21 @@ status_t Parameters::initialize(const CameraMetadata *info) { previewCallbackFlags = 0; previewCallbackOneShot = false; - char value[PROPERTY_VALUE_MAX]; - property_get("camera.disable_zsl_mode", value, "0"); - if (!strcmp(value,"1")) { - ALOGI("Camera %d: Disabling ZSL mode", cameraId); + 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 { - zslMode = true; + 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; + } } lightFx = LIGHTFX_NONE; |