tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix ICameraDeviceCallback version in VTS test

Browse source 
am: cccd5bf1dd

Change-Id: I06df275ab155ecb3cdf2e829c6253023ff23a386
This commit is contained in:
Hsin-Yi Chen 2018-07-20 07:03:59 -07:00 committed by android-build-merger
commit ff5bfd5b30
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
View file

@ -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::BufferCache;
using ::android::hardware::camera::device::V3_2::CaptureRequest; using ::android::hardware::camera::device::V3_2::CaptureRequest;
using ::android::hardware::camera::device::V3_2::CaptureResult; 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::ICameraDeviceSession;
using ::android::hardware::camera::device::V3_2::NotifyMsg; using ::android::hardware::camera::device::V3_2::NotifyMsg;
using ::android::hardware::camera::device::V3_2::RequestTemplate; using ::android::hardware::camera::device::V3_2::RequestTemplate;
@ -532,7 +531,7 @@ public:
hidl_vec<hidl_string> getCameraDeviceNames(sp<ICameraProvider> provider); hidl_vec<hidl_string> getCameraDeviceNames(sp<ICameraProvider> provider);
struct EmptyDeviceCb : public ICameraDeviceCallback { struct EmptyDeviceCb : public V3_4::ICameraDeviceCallback {
virtual Return<void> processCaptureResult( virtual Return<void> processCaptureResult(
const hidl_vec<CaptureResult>& /*results*/) override { const hidl_vec<CaptureResult>& /*results*/) override {
ALOGI("processCaptureResult callback"); ALOGI("processCaptureResult callback");
@ -540,6 +539,13 @@ public:
return Void(); 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 { virtual Return<void> notify(const hidl_vec<NotifyMsg>& /*msgs*/) override {
ALOGI("notify callback"); ALOGI("notify callback");
ADD_FAILURE(); // Empty callback should not reach here ADD_FAILURE(); // Empty callback should not reach here