diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2017-01-10 13:15:38 -0800 |
|---|---|---|
| committer | Yin-Chia Yeh <yinchiayeh@google.com> | 2017-01-17 16:51:03 -0800 |
| commit | a8f447d75c1a0fff62dcb18863a105acf10ffc52 (patch) | |
| tree | 81575581305069fc281e2bb6c4439e28d82e195e /camera/device/3.2/default/CameraDeviceSession.cpp | |
| parent | d926f9334f9034b3d1562905644241f481b4a978 (diff) | |
Camera: make fence import agnostic to hidl transport
This will introduce one more FD dup/close in passthrough mode, but
we have no other choice as camera server will not know whether
it is running in passthrough or binderized mode.
Test: running Camera2 API CTS
Bug: 30985004
Change-Id: I407d54a51c51fc09477dfb6236ab1b53bb1e0a21
Diffstat (limited to 'camera/device/3.2/default/CameraDeviceSession.cpp')
| -rw-r--r-- | camera/device/3.2/default/CameraDeviceSession.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/camera/device/3.2/default/CameraDeviceSession.cpp b/camera/device/3.2/default/CameraDeviceSession.cpp index 5f7b9508c7..26b7b738ef 100644 --- a/camera/device/3.2/default/CameraDeviceSession.cpp +++ b/camera/device/3.2/default/CameraDeviceSession.cpp @@ -94,15 +94,7 @@ public: if (handle == nullptr || handle->numFds == 0) { fd = -1; } else if (handle->numFds == 1) { -//TODO(b/34110242): make this hidl transport agnostic -#ifdef BINDERIZED fd = dup(handle->data[0]); - // TODO(b/34169301) - // Camera service expect FD be closed by HAL process (in passthrough mode) - // close(handle->data[0]); -#else - fd = handle->data[0]; -#endif if (fd < 0) { ALOGE("failed to dup fence fd %d", handle->data[0]); return false; @@ -118,13 +110,9 @@ public: void closeFence(int fd) { -#ifdef BINDERIZED if (fd >= 0) { close(fd); } -#else - (void) fd; -#endif } private: |