diff options
| author | Igor Murashkin <iam@google.com> | 2014-08-19 15:14:29 -0700 |
|---|---|---|
| committer | Igor Murashkin <iam@google.com> | 2014-08-19 15:20:04 -0700 |
| commit | c758f2276f9f9fca9ea24a6647361726acb03646 (patch) | |
| tree | 0908ef36ee0e2d475df150d0d9b8a755f8552aa8 /services/camera/libcameraservice/device3/Camera3Stream.cpp | |
| parent | a858ea0495c887621a2fd9c0afc13780deccb597 (diff) | |
| download | frameworks_av-c758f2276f9f9fca9ea24a6647361726acb03646.zip frameworks_av-c758f2276f9f9fca9ea24a6647361726acb03646.tar.gz frameworks_av-c758f2276f9f9fca9ea24a6647361726acb03646.tar.bz2 | |
camera: hal3: Remove register_stream setprop check
camera3_device_t::register_stream must always be NULL in HAL3.2+ cameras
Bug: 13914251
Change-Id: I116ee71135a827c8b4db61cd91f56ba56da3f0ef
Diffstat (limited to 'services/camera/libcameraservice/device3/Camera3Stream.cpp')
| -rw-r--r-- | services/camera/libcameraservice/device3/Camera3Stream.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/services/camera/libcameraservice/device3/Camera3Stream.cpp b/services/camera/libcameraservice/device3/Camera3Stream.cpp index d7b1871..3f6254f 100644 --- a/services/camera/libcameraservice/device3/Camera3Stream.cpp +++ b/services/camera/libcameraservice/device3/Camera3Stream.cpp @@ -381,18 +381,7 @@ status_t Camera3Stream::registerBuffersLocked(camera3_device *hal3Device) { if (hal3Device->common.version >= CAMERA_DEVICE_API_VERSION_3_2) { ALOGV("%s: register_stream_buffers unused as of HAL3.2", __FUNCTION__); - /** - * Skip the NULL check if camera.dev.register_stream is 1. - * - * For development-validation purposes only. - * - * TODO: Remove the property check before shipping L (b/13914251). - */ - char value[PROPERTY_VALUE_MAX] = { '\0', }; - property_get("camera.dev.register_stream", value, "0"); - int propInt = atoi(value); - - if (propInt == 0 && hal3Device->ops->register_stream_buffers != NULL) { + if (hal3Device->ops->register_stream_buffers != NULL) { ALOGE("%s: register_stream_buffers is deprecated in HAL3.2; " "must be set to NULL in camera3_device::ops", __FUNCTION__); return INVALID_OPERATION; |