Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cccd5bf1 authored by Hsin-Yi Chen's avatar Hsin-Yi Chen
Browse files

Fix ICameraDeviceCallback version in VTS test 

Test: ./VtsHalCameraProviderV2_4TargetTest --gtest_filter=CameraHidlTest.constructDefaultRequestSettings
Bug: 111625570
Change-Id: I8ad02afb0e9c2131c240999c4a8c78a1f770e847
parent 8f7677d1

camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp

+8 −2
Original line number Original line Diff line number Diff line
@@ -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