diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-17 21:05:42 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-17 21:05:42 +0000 |
commit | b1023e44e14a2f6cb762ed37c37a889bfaa18827 (patch) | |
tree | 3b615f21ec898ec9b3d0bf41fcbe19a98e4f7caf | |
parent | 3e12494be0fbd389ea28042a2f675fba9fb5471f (diff) | |
parent | 06446bf3c5da0f42a7fe663f4f414dcfe5b5b019 (diff) | |
download | camera-android-platform-12.1.0_r26.tar.gz |
Snap for 8589293 from 06446bf3c5da0f42a7fe663f4f414dcfe5b5b019 to sc-v2-platform-releaseandroid-platform-12.1.0_r9android-platform-12.1.0_r8android-platform-12.1.0_r7android-platform-12.1.0_r6android-platform-12.1.0_r5android-platform-12.1.0_r4android-platform-12.1.0_r27android-platform-12.1.0_r26android-platform-12.1.0_r25android-platform-12.1.0_r24android-platform-12.1.0_r23android-platform-12.1.0_r22android-platform-12.1.0_r21android-platform-12.1.0_r20android-platform-12.1.0_r19android-platform-12.1.0_r18android-platform-12.1.0_r17android-platform-12.1.0_r16android-platform-12.1.0_r15android-platform-12.1.0_r14android-platform-12.1.0_r13android-platform-12.1.0_r12android-platform-12.1.0_r11android-platform-12.1.0_r10android12L-platform-release
Change-Id: I233420de2f03b2c736dbb33389e5903e572b3c8c
-rw-r--r-- | common/hal/hidl_service/hidl_camera_device_session.cc | 8 | ||||
-rw-r--r-- | common/hal/hidl_service/hidl_camera_provider.cc | 14 |
2 files changed, 19 insertions, 3 deletions
diff --git a/common/hal/hidl_service/hidl_camera_device_session.cc b/common/hal/hidl_service/hidl_camera_device_session.cc index d0dc010..3af335e 100644 --- a/common/hal/hidl_service/hidl_camera_device_session.cc +++ b/common/hal/hidl_service/hidl_camera_device_session.cc @@ -304,7 +304,13 @@ void HidlCameraDeviceSession::ReturnStreamBuffers( } } - hidl_device_callback_->returnStreamBuffers(hidl_return_buffers); + auto hidl_res = + hidl_device_callback_->returnStreamBuffers(hidl_return_buffers); + if (!hidl_res.isOk()) { + ALOGE("%s: return stream buffers transaction failed: %s.", __FUNCTION__, + hidl_res.description().c_str()); + return; + } } status_t HidlCameraDeviceSession::InitializeBufferMapper() { diff --git a/common/hal/hidl_service/hidl_camera_provider.cc b/common/hal/hidl_service/hidl_camera_provider.cc index f9fdc43..528d23d 100644 --- a/common/hal/hidl_service/hidl_camera_provider.cc +++ b/common/hal/hidl_service/hidl_camera_provider.cc @@ -83,11 +83,16 @@ status_t HidlCameraProvider::Initialize() { } std::unique_lock<std::mutex> lock(callbacks_lock_); - callbacks_->cameraDeviceStatusChange( + auto cb_status = callbacks_->cameraDeviceStatusChange( "device@" + device::V3_7::implementation::HidlCameraDevice::kDeviceVersion + "/" + kProviderName + "/" + camera_id, hidl_camera_device_status); + if (!cb_status.isOk()) { + ALOGE("%s: device status change transaction error: %s", + __FUNCTION__, cb_status.description().c_str()); + return; + } }), .physical_camera_device_status_change = google_camera_hal:: PhysicalCameraDeviceStatusChangeFunc([this]( @@ -148,11 +153,16 @@ status_t HidlCameraProvider::Initialize() { } std::unique_lock<std::mutex> lock(callbacks_lock_); - callbacks_->torchModeStatusChange( + auto cb_status = callbacks_->torchModeStatusChange( "device@" + device::V3_7::implementation::HidlCameraDevice::kDeviceVersion + "/" + kProviderName + "/" + camera_id, hidl_torch_status); + if (!cb_status.isOk()) { + ALOGE("%s: torch status change transaction error: %s", + __FUNCTION__, cb_status.description().c_str()); + return; + } }), }; |