Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "ExternalCameraHAL: Check for empty native handle instead of null." into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-11-03 01:10:16 +00:00
committed by Gerrit Code Review
parent 4f73689e26 e6a88a8119
commit 7e4037cf01
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
camera/device/default/ExternalCameraUtils.cpp
View File

@@ -402,7 +402,10 @@ aidl::android::hardware::camera::common::Status importBufferImpl(
buffer_handle_t buf, buffer_handle_t buf,
/*out*/ buffer_handle_t** outBufPtr) { /*out*/ buffer_handle_t** outBufPtr) {
using ::aidl::android::hardware::camera::common::Status; using ::aidl::android::hardware::camera::common::Status;
if (buf == nullptr && bufId == BUFFER_ID_NO_BUFFER) { // AIDL does not have null NativeHandles. It sends empty handles instead.
// We check for when the buf is empty instead of when buf is null.
bool isBufEmpty = buf == nullptr || (buf->numFds == 0 && buf->numInts == 0);
if (isBufEmpty && bufId == BUFFER_ID_NO_BUFFER) {
ALOGE("%s: bufferId %" PRIu64 " has null buffer handle!", __FUNCTION__, bufId); ALOGE("%s: bufferId %" PRIu64 " has null buffer handle!", __FUNCTION__, bufId);
return Status::ILLEGAL_ARGUMENT; return Status::ILLEGAL_ARGUMENT;
} }
@@ -857,4 +860,4 @@ int AllocatedV4L2Frame::getData(uint8_t** outData, size_t* dataSize) {
} // namespace device } // namespace device
} // namespace camera } // namespace camera
} // namespace hardware } // namespace hardware
} // namespace android } // namespace android