diff options
| author | Igor Murashkin <iam@google.com> | 2013-05-23 16:51:44 -0700 |
|---|---|---|
| committer | Igor Murashkin <iam@google.com> | 2013-05-23 17:00:48 -0700 |
| commit | 059161b7ab0a38b276b1aa26e73ff4398a02e012 (patch) | |
| tree | 7722ef858827c50684b7f044ee3a1ec1b981b893 /services | |
| parent | efb0fd232388b1f726c59f2ec20eea2d3ea8465d (diff) | |
| download | frameworks_av-059161b7ab0a38b276b1aa26e73ff4398a02e012.zip frameworks_av-059161b7ab0a38b276b1aa26e73ff4398a02e012.tar.gz frameworks_av-059161b7ab0a38b276b1aa26e73ff4398a02e012.tar.bz2 | |
camera3: Disable ZSL for limited mode camera HALs
Bug: 9111852
Change-Id: Idad7e0d2f912341bd643d0ad1a0861fb2043aa90
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; |