tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "ExternalCameraHAL: Check for empty native handle instead of null." into main am: 7e4037cf01 am: b6452b7ad8

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2787022

Change-Id: I644ac5a50758874af31c87e075eda77fe5483d6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-11-03 02:09:17 +00:00 committed by Automerger Merge Worker
commit a75bf4a77a
1 changed files with 5 additions and 2 deletions
Show stats 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,
/*out*/ buffer_handle_t** outBufPtr) {
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);
return Status::ILLEGAL_ARGUMENT;
}
@ -857,4 +860,4 @@ int AllocatedV4L2Frame::getData(uint8_t** outData, size_t* dataSize) {
} // namespace device
} // namespace camera
} // namespace hardware
} // namespace android
} // namespace android