diff options
| author | Hsin-Yi Chen <hsinyichen@google.com> | 2018-07-20 12:52:20 +0800 |
|---|---|---|
| committer | Hsin-Yi Chen <hsinyichen@google.com> | 2018-08-13 15:16:28 +0800 |
| commit | 68c347fa6249bb2666505c2a7e33f827a9efe1b4 (patch) | |
| tree | 9ff20a5f934544114cb6a68c2c781c80aedf3239 | |
| parent | 795990cca6f0979ec9cd397e345bd87a247ff97f (diff) | |
| download | platform_hardware_interfaces-68c347fa6249bb2666505c2a7e33f827a9efe1b4.tar.gz platform_hardware_interfaces-68c347fa6249bb2666505c2a7e33f827a9efe1b4.tar.bz2 platform_hardware_interfaces-68c347fa6249bb2666505c2a7e33f827a9efe1b4.zip | |
Fix ICameraDeviceCallback version in VTS test
Test: ./VtsHalCameraProviderV2_4TargetTest --gtest_filter=CameraHidlTest.constructDefaultRequestSettings
Bug: 111625570
Change-Id: I8ad02afb0e9c2131c240999c4a8c78a1f770e847
Merged-In: I8ad02afb0e9c2131c240999c4a8c78a1f770e847
(cherry picked from commit cccd5bf1dd32c49ac6e10d870829b1ae40d19580)
| -rw-r--r-- | camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp index 95c7167c3b..0d92c37c12 100644 --- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp +++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp @@ -87,7 +87,6 @@ using ::android::hardware::camera::device::V3_2::ICameraDevice; using ::android::hardware::camera::device::V3_2::BufferCache; using ::android::hardware::camera::device::V3_2::CaptureRequest; using ::android::hardware::camera::device::V3_2::CaptureResult; -using ::android::hardware::camera::device::V3_2::ICameraDeviceCallback; using ::android::hardware::camera::device::V3_2::ICameraDeviceSession; using ::android::hardware::camera::device::V3_2::NotifyMsg; using ::android::hardware::camera::device::V3_2::RequestTemplate; @@ -532,7 +531,7 @@ public: hidl_vec<hidl_string> getCameraDeviceNames(sp<ICameraProvider> provider); - struct EmptyDeviceCb : public ICameraDeviceCallback { + struct EmptyDeviceCb : public V3_4::ICameraDeviceCallback { virtual Return<void> processCaptureResult( const hidl_vec<CaptureResult>& /*results*/) override { ALOGI("processCaptureResult callback"); @@ -540,6 +539,13 @@ public: return Void(); } + virtual Return<void> processCaptureResult_3_4( + const hidl_vec<V3_4::CaptureResult>& /*results*/) override { + ALOGI("processCaptureResult_3_4 callback"); + ADD_FAILURE(); // Empty callback should not reach here + return Void(); + } + virtual Return<void> notify(const hidl_vec<NotifyMsg>& /*msgs*/) override { ALOGI("notify callback"); ADD_FAILURE(); // Empty callback should not reach here |