diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-02 00:06:40 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-02 00:06:40 +0000 |
commit | 922d486f55ca365d0eafdfc5602e67b1b963f1fb (patch) | |
tree | 3b615f21ec898ec9b3d0bf41fcbe19a98e4f7caf | |
parent | 2079123b6cc0a716d46b13342edd0d3829c47f2a (diff) | |
parent | 379051d257bf34a0982d44ab28e90666140a278b (diff) | |
download | camera-android12-qpr3-s2-release.tar.gz |
Snap for 8237733 from 379051d257bf34a0982d44ab28e90666140a278b to sc-qpr3-releaseandroid-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-release
Change-Id: I854804bbc87e1cb723c800cecb674a742ab1f3ce
-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; + } }), }; |