diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2014-03-10 18:59:38 -0700 |
|---|---|---|
| committer | Ruben Brunk <rubenbrunk@google.com> | 2014-03-17 22:12:51 +0000 |
| commit | 947237f67dd5335b26326a98fd7d3eae5fd7d702 (patch) | |
| tree | 500d3539bfa868bd70ef910b0ae338f810c07f78 /services/camera/libcameraservice/device2 | |
| parent | e1445da74730473a66a3ae8414e940aebfe6585d (diff) | |
| download | frameworks_av-947237f67dd5335b26326a98fd7d3eae5fd7d702.zip frameworks_av-947237f67dd5335b26326a98fd7d3eae5fd7d702.tar.gz frameworks_av-947237f67dd5335b26326a98fd7d3eae5fd7d702.tar.bz2 | |
camera3: Remove old vendor tag ops dependencies.
Bug: 12134423
Change-Id: I7acdf76d4c0674bdb1cc939592d4620687c785c3
Diffstat (limited to 'services/camera/libcameraservice/device2')
| -rw-r--r-- | services/camera/libcameraservice/device2/Camera2Device.cpp | 14 | ||||
| -rw-r--r-- | services/camera/libcameraservice/device2/Camera2Device.h | 1 |
2 files changed, 0 insertions, 15 deletions
diff --git a/services/camera/libcameraservice/device2/Camera2Device.cpp b/services/camera/libcameraservice/device2/Camera2Device.cpp index dc97c47..f60ca98 100644 --- a/services/camera/libcameraservice/device2/Camera2Device.cpp +++ b/services/camera/libcameraservice/device2/Camera2Device.cpp @@ -112,20 +112,6 @@ status_t Camera2Device::initialize(camera_module_t *module) return res; } - res = device->ops->get_metadata_vendor_tag_ops(device, &mVendorTagOps); - if (res != OK ) { - ALOGE("%s: Camera %d: Unable to retrieve tag ops from device: %s (%d)", - __FUNCTION__, mId, strerror(-res), res); - device->common.close(&device->common); - return res; - } - res = set_camera_metadata_vendor_tag_ops(mVendorTagOps); - if (res != OK) { - ALOGE("%s: Camera %d: Unable to set tag ops: %s (%d)", - __FUNCTION__, mId, strerror(-res), res); - device->common.close(&device->common); - return res; - } res = device->ops->set_notify_callback(device, notificationCallback, NULL); if (res != OK) { diff --git a/services/camera/libcameraservice/device2/Camera2Device.h b/services/camera/libcameraservice/device2/Camera2Device.h index 1f53c56..5b91f88 100644 --- a/services/camera/libcameraservice/device2/Camera2Device.h +++ b/services/camera/libcameraservice/device2/Camera2Device.h @@ -78,7 +78,6 @@ class Camera2Device: public CameraDeviceBase { camera2_device_t *mHal2Device; CameraMetadata mDeviceInfo; - vendor_tag_query_ops_t *mVendorTagOps; /** * Queue class for both sending requests to a camera2 device, and for |