commit 13be384bc6bb930b06a31844fd1d6b7fd752f570
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 29 17:18:58 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 29 17:18:58 2022 +0000
tree c8281be7b28f0ac9d31c36382ecd100b1b445594
parent 0598915368d31a650526cfa2c426a25f724c428f
parent 179db67c40cae0e797705cfaa88c81f0045fd780

Snap for 8782634 from 179db67c40cae0e797705cfaa88c81f0045fd780 to sdk-release

Change-Id: Id36bb55349f024e2f19a6d32b12a6625681f2aba

common/hal/hidl_service/hidl_camera_device_session.cc

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 @@
     }
   }
 
-  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() {

common/hal/hidl_service/hidl_camera_provider.cc

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 @@
             }
 
             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 @@
             }
 
             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;
+            }
           }),
   };