diff options
| author | Shuzhen Wang <shuzhenwang@google.com> | 2023-11-28 19:10:41 +0000 |
|---|---|---|
| committer | Shuzhen Wang <shuzhenwang@google.com> | 2023-12-05 16:03:09 +0000 |
| commit | 1f89b09a78e6b8b24895decb9db2ba2eb78d1761 (patch) | |
| tree | fa92530aae90f0f7153d657379834a6b35c89eb8 | |
| parent | 3bdae66eeb8b4aae3f8658dbccb6df2a79c17416 (diff) | |
| download | camera-1f89b09a78e6b8b24895decb9db2ba2eb78d1761.tar.gz | |
EmulatedCamera: Bump up camera device version
Bring EmulatedCamera HAL to latest camera device version.
Test: Run FeatureCombinationTest CTS test
Bug: 298033056
Change-Id: I81ef6cf8e788b71b146e1576fd7b58c9d2b0324e
4 files changed, 29 insertions, 2 deletions
diff --git a/common/hal/aidl_service/Android.bp b/common/hal/aidl_service/Android.bp index 5895db8..4872360 100644 --- a/common/hal/aidl_service/Android.bp +++ b/common/hal/aidl_service/Android.bp @@ -92,7 +92,7 @@ cc_defaults { shared_libs: [ "android.hardware.camera.device-V3-ndk", "android.hardware.camera.common-V1-ndk", - "android.hardware.camera.provider-V2-ndk", + "android.hardware.camera.provider-V3-ndk", "android.hardware.thermal-V1-ndk", "libbinder_ndk", "libbase", diff --git a/common/hal/aidl_service/aidl_camera_device.cc b/common/hal/aidl_service/aidl_camera_device.cc index 9d6c869..b1c984b 100644 --- a/common/hal/aidl_service/aidl_camera_device.cc +++ b/common/hal/aidl_service/aidl_camera_device.cc @@ -162,6 +162,26 @@ ScopedAStatus AidlCameraDevice::getTorchStrengthLevel(int32_t* strength_level) { return ScopedAStatus::ok(); } +ScopedAStatus AidlCameraDevice::constructDefaultRequestSettings( + RequestTemplate /*requestTemplate*/, CameraMetadata* requestSettings) { + if (requestSettings == nullptr) { + return ScopedAStatus::fromServiceSpecificError( + static_cast<int32_t>(Status::ILLEGAL_ARGUMENT)); + } + return ScopedAStatus::fromServiceSpecificError( + static_cast<int32_t>(Status::OPERATION_NOT_SUPPORTED)); +} + +ScopedAStatus AidlCameraDevice::isStreamCombinationWithSettingsSupported( + const StreamConfiguration& /*streamConfiguration*/, bool* supported) { + if (supported == nullptr) { + return ScopedAStatus::fromServiceSpecificError( + static_cast<int32_t>(Status::ILLEGAL_ARGUMENT)); + } + return ScopedAStatus::fromServiceSpecificError( + static_cast<int32_t>(Status::OPERATION_NOT_SUPPORTED)); +} + ScopedAStatus AidlCameraDevice::getPhysicalCameraCharacteristics( const std::string& physicalCameraId, CameraMetadata* characteristics_ret) { if (characteristics_ret == nullptr) { diff --git a/common/hal/aidl_service/aidl_camera_device.h b/common/hal/aidl_service/aidl_camera_device.h index 86b7263..bd62834 100644 --- a/common/hal/aidl_service/aidl_camera_device.h +++ b/common/hal/aidl_service/aidl_camera_device.h @@ -36,6 +36,7 @@ using aidl::android::hardware::camera::device::ICameraDevice; using aidl::android::hardware::camera::device::ICameraDeviceCallback; using aidl::android::hardware::camera::device::ICameraDeviceSession; using aidl::android::hardware::camera::device::ICameraInjectionSession; +using aidl::android::hardware::camera::device::RequestTemplate; using aidl::android::hardware::camera::device::StreamConfiguration; using ::android::hardware::camera::implementation::AidlProfiler; using ndk::ScopedAStatus; @@ -86,6 +87,12 @@ class AidlCameraDevice : public BnCameraDevice { ScopedAStatus getTorchStrengthLevel(int32_t* strength_level) override; + ScopedAStatus constructDefaultRequestSettings( + RequestTemplate requestTemplate, CameraMetadata* requestSettings) override; + + ScopedAStatus isStreamCombinationWithSettingsSupported( + const StreamConfiguration& streamConfiguration, bool* supported) override; + // End of override functions in ICameraDevice AidlCameraDevice() = default; diff --git a/common/hal/aidl_service/android.hardware.camera.provider@2.7-service-google.xml b/common/hal/aidl_service/android.hardware.camera.provider@2.7-service-google.xml index a772f31..048c9c9 100644 --- a/common/hal/aidl_service/android.hardware.camera.provider@2.7-service-google.xml +++ b/common/hal/aidl_service/android.hardware.camera.provider@2.7-service-google.xml @@ -1,7 +1,7 @@ <manifest version="1.0" type="device"> <hal format="aidl"> <name>android.hardware.camera.provider</name> - <version>2</version> + <version>3</version> <interface> <name>ICameraProvider</name> <instance>internal/0</instance> |