diff options
author | TreeHugger Robot | 2017-05-09 12:30:35 -0500 |
---|---|---|
committer | Android (Google) Code Review | 2017-05-09 12:30:36 -0500 |
commit | 0b3d86e05afb30e27990089ba4283c28d31f2259 (patch) | |
tree | 1e77e25ea44ebeedddf02dd6063e86fe3d72bdfa | |
parent | c63bdfbd7483addf3f1ffe432c2749d3ef04a0f9 (diff) | |
parent | e0a0a1c2391bbf97cd1c2cb39f82a16a11b70d16 (diff) | |
download | platform-hardware-interfaces-0b3d86e05afb30e27990089ba4283c28d31f2259.tar.gz platform-hardware-interfaces-0b3d86e05afb30e27990089ba4283c28d31f2259.tar.xz platform-hardware-interfaces-0b3d86e05afb30e27990089ba4283c28d31f2259.zip |
Merge "Camera: Clean up TODOs that aren't going to be addressed." into oc-dev
-rw-r--r-- | camera/common/1.0/default/CameraMetadata.cpp | 2 | ||||
-rw-r--r-- | camera/device/1.0/default/CameraDevice.cpp | 3 | ||||
-rw-r--r-- | camera/provider/2.4/default/CameraProvider.cpp | 4 |
3 files changed, 0 insertions, 9 deletions
diff --git a/camera/common/1.0/default/CameraMetadata.cpp b/camera/common/1.0/default/CameraMetadata.cpp index 0e7ef6e1..4c54931a 100644 --- a/camera/common/1.0/default/CameraMetadata.cpp +++ b/camera/common/1.0/default/CameraMetadata.cpp | |||
@@ -508,8 +508,6 @@ status_t CameraMetadata::getTagFromName(const char *name, | |||
508 | } | 508 | } |
509 | } | 509 | } |
510 | 510 | ||
511 | // TODO: Make above get_camera_metadata_section_from_name ? | ||
512 | |||
513 | if (section == NULL) { | 511 | if (section == NULL) { |
514 | return NAME_NOT_FOUND; | 512 | return NAME_NOT_FOUND; |
515 | } else { | 513 | } else { |
diff --git a/camera/device/1.0/default/CameraDevice.cpp b/camera/device/1.0/default/CameraDevice.cpp index 4f26c548..6f4e70f8 100644 --- a/camera/device/1.0/default/CameraDevice.cpp +++ b/camera/device/1.0/default/CameraDevice.cpp | |||
@@ -183,7 +183,6 @@ int CameraDevice::sDequeueBuffer(struct preview_stream_ops* w, | |||
183 | } | 183 | } |
184 | 184 | ||
185 | int CameraDevice::sLockBuffer(struct preview_stream_ops*, buffer_handle_t*) { | 185 | int CameraDevice::sLockBuffer(struct preview_stream_ops*, buffer_handle_t*) { |
186 | // TODO: make sure lock_buffer is indeed a no-op (and will always be) | ||
187 | return 0; | 186 | return 0; |
188 | } | 187 | } |
189 | 188 | ||
@@ -585,8 +584,6 @@ Return<void> CameraDevice::getCameraInfo(getCameraInfo_cb _hidl_cb) { | |||
585 | cameraInfo.facing = (CameraFacing) info.facing; | 584 | cameraInfo.facing = (CameraFacing) info.facing; |
586 | // Device 1.0 does not support external camera facing. | 585 | // Device 1.0 does not support external camera facing. |
587 | // The closest approximation would be front camera. | 586 | // The closest approximation would be front camera. |
588 | // TODO: figure out should we override here or let | ||
589 | // camera service handle it. | ||
590 | if (cameraInfo.facing == CameraFacing::EXTERNAL) { | 587 | if (cameraInfo.facing == CameraFacing::EXTERNAL) { |
591 | cameraInfo.facing = CameraFacing::FRONT; | 588 | cameraInfo.facing = CameraFacing::FRONT; |
592 | } | 589 | } |
diff --git a/camera/provider/2.4/default/CameraProvider.cpp b/camera/provider/2.4/default/CameraProvider.cpp index 791b93c7..19f7bdd7 100644 --- a/camera/provider/2.4/default/CameraProvider.cpp +++ b/camera/provider/2.4/default/CameraProvider.cpp | |||
@@ -461,10 +461,6 @@ Return<void> CameraProvider::getCameraDeviceInterface_V3_x( | |||
461 | return Void(); | 461 | return Void(); |
462 | } | 462 | } |
463 | 463 | ||
464 | // TODO: we also need to keep a wp list of all generated devices to notify | ||
465 | // devices of device present status change, but then each device might | ||
466 | // need a sp<provider> to keep provider alive until all device closed? | ||
467 | // Problem: do we have external camera products to test this? | ||
468 | sp<android::hardware::camera::device::V3_2::implementation::CameraDevice> device = | 464 | sp<android::hardware::camera::device::V3_2::implementation::CameraDevice> device = |
469 | new android::hardware::camera::device::V3_2::implementation::CameraDevice( | 465 | new android::hardware::camera::device::V3_2::implementation::CameraDevice( |
470 | mModule, cameraId, mCameraDeviceNames); | 466 | mModule, cameraId, mCameraDeviceNames); |