diff options
| author | Avichal Rakesh <arakesh@google.com> | 2022-05-25 20:59:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-05-25 20:59:52 +0000 |
| commit | 9a66549f5c88f13168794c5a45a4c12c92cee0d1 (patch) | |
| tree | 951e0a83179eaf8e288dad8c198f98fe0308b56f /camera | |
| parent | b119e9e3c70a098716b0d277772776487342c801 (diff) | |
| parent | 7ab50a866a9aa904d60e9944d34ca7d9ca72119e (diff) | |
Merge "Camera VTS: Fix incorrect return value check" into tm-dev am: 7ab50a866a
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/18565633
Change-Id: I06a72c76a21d34f16a64e20b06f2e959db72a078
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp b/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp index 462698c87a..fe03732aff 100644 --- a/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp +++ b/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp @@ -39,7 +39,7 @@ using ::aidl::android::hardware::camera::device::ICameraDevice; using ::aidl::android::hardware::camera::metadata::RequestAvailableDynamicRangeProfilesMap; using ::aidl::android::hardware::camera::metadata::SensorPixelMode; using ::aidl::android::hardware::camera::provider::CameraIdAndStreamCombination; -using ::aidl::android::hardware::camera::provider::ICameraProviderCallbackDefault; +using ::aidl::android::hardware::camera::provider::BnCameraProviderCallback; using ::ndk::ScopedAStatus; @@ -86,7 +86,7 @@ TEST_P(CameraAidlTest, getVendorTags) { // Test if ICameraProvider::setCallback returns Status::OK TEST_P(CameraAidlTest, setCallback) { - struct ProviderCb : public ICameraProviderCallbackDefault { + struct ProviderCb : public BnCameraProviderCallback { ScopedAStatus cameraDeviceStatusChange(const std::string& cameraDeviceName, CameraDeviceStatus newStatus) override { ALOGI("camera device status callback name %s, status %d", cameraDeviceName.c_str(), @@ -109,11 +109,11 @@ TEST_P(CameraAidlTest, setCallback) { } }; - std::shared_ptr<ProviderCb> cb = ProviderCb::make<ProviderCb>(); + std::shared_ptr<ProviderCb> cb = ndk::SharedRefBase::make<ProviderCb>(); ScopedAStatus ret = mProvider->setCallback(cb); ASSERT_TRUE(ret.isOk()); ret = mProvider->setCallback(nullptr); - ASSERT_TRUE(ret.isOk()); + ASSERT_EQ(static_cast<int32_t>(Status::ILLEGAL_ARGUMENT), ret.getServiceSpecificError()); } // Test if ICameraProvider::getCameraDeviceInterface returns Status::OK and non-null device @@ -399,9 +399,6 @@ TEST_P(CameraAidlTest, setTorchMode) { } } } - - ret = mProvider->setCallback(nullptr); - ASSERT_TRUE(ret.isOk()); } // Check dump functionality. |