diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-08-14 16:35:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-08-14 16:35:34 +0000 |
| commit | a935e652afdf60e79964b8eb550e5542e19efddd (patch) | |
| tree | fd917d01fb800b8e6f4a7e1b8b338c513f0ab02b | |
| parent | 2d0ba0f61b720ec0426fe8e544715dd5133e91bd (diff) | |
| parent | 68c347fa6249bb2666505c2a7e33f827a9efe1b4 (diff) | |
| download | android_hardware_interfaces-a935e652afdf60e79964b8eb550e5542e19efddd.tar.gz android_hardware_interfaces-a935e652afdf60e79964b8eb550e5542e19efddd.tar.bz2 android_hardware_interfaces-a935e652afdf60e79964b8eb550e5542e19efddd.zip | |
Merge "Fix ICameraDeviceCallback version in VTS test" into pie-vts-dev
| -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 95c7167c3..0d92c37c1 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 |