summaryrefslogtreecommitdiff
path: root/devices
diff options
context:
space:
mode:
authortimothywang <timothywang@google.com>2021-07-27 17:51:46 +0800
committertimothywang <timothywang@google.com>2021-09-09 10:34:17 +0800
commit6efce275b1a39ec2858a991490a970279d173d9c (patch)
treebe94c86acd3b0c94b9eb1074ff920faa57223027 /devices
parentb1161f73cf4337c015405a5955b7af078cfa9f5c (diff)
downloadcamera-6efce275b1a39ec2858a991490a970279d173d9c.tar.gz
Integrate device state into hal
Pass the device state to camera provider hwl. bug: 167570661 Test: aosp camera app Change-Id: Ibf79de336f39066a52cf15c55b956f90ab6458d9
Diffstat (limited to 'devices')
-rw-r--r--devices/EmulatedCamera/hwl/EmulatedCameraProviderHWLImpl.cpp5
-rw-r--r--devices/EmulatedCamera/hwl/EmulatedCameraProviderHWLImpl.h3
2 files changed, 8 insertions, 0 deletions
diff --git a/devices/EmulatedCamera/hwl/EmulatedCameraProviderHWLImpl.cpp b/devices/EmulatedCamera/hwl/EmulatedCameraProviderHWLImpl.cpp
index 910c9cb..7e833dc 100644
--- a/devices/EmulatedCamera/hwl/EmulatedCameraProviderHWLImpl.cpp
+++ b/devices/EmulatedCamera/hwl/EmulatedCameraProviderHWLImpl.cpp
@@ -928,4 +928,9 @@ status_t EmulatedCameraProviderHwlImpl::CreateBufferAllocatorHwl(
// Currently not supported
return INVALID_OPERATION;
}
+
+status_t EmulatedCameraProviderHwlImpl::NotifyDeviceStateChange(
+ DeviceState /*device_state*/) {
+ return OK;
+}
} // namespace android
diff --git a/devices/EmulatedCamera/hwl/EmulatedCameraProviderHWLImpl.h b/devices/EmulatedCamera/hwl/EmulatedCameraProviderHWLImpl.h
index 455e045..5a13332 100644
--- a/devices/EmulatedCamera/hwl/EmulatedCameraProviderHWLImpl.h
+++ b/devices/EmulatedCamera/hwl/EmulatedCameraProviderHWLImpl.h
@@ -30,6 +30,7 @@ using google_camera_hal::CameraDeviceHwl;
using google_camera_hal::CameraDeviceStatus;
using google_camera_hal::CameraIdAndStreamConfiguration;
using google_camera_hal::CameraProviderHwl;
+using google_camera_hal::DeviceState;
using google_camera_hal::HalCameraMetadata;
using google_camera_hal::HwlCameraProviderCallback;
using google_camera_hal::HwlPhysicalCameraDeviceStatusChangeFunc;
@@ -71,6 +72,8 @@ class EmulatedCameraProviderHwlImpl : public CameraProviderHwl {
status_t CreateBufferAllocatorHwl(std::unique_ptr<CameraBufferAllocatorHwl>*
camera_buffer_allocator_hwl) override;
+
+ status_t NotifyDeviceStateChange(DeviceState device_state) override;
// End of override functions in CameraProviderHwl.
private: