diff options
| author | Rob Seymour <rseymour@google.com> | 2022-04-02 03:51:47 +0000 |
|---|---|---|
| committer | Rob Seymour <rseymour@google.com> | 2022-04-02 03:59:48 +0000 |
| commit | cb23b25a3c51a69bb3727606b0b3a9aa5e82a144 (patch) | |
| tree | 0cfa51adf525605d5a092c1e180cecb031c18031 /camera | |
| parent | 31658f615ff161c14986b4dcdbe283941670f234 (diff) | |
| parent | e552504dd9dce4a9a8392e44dc300d33be0362c7 (diff) | |
Merge TP1A.220328.001
Change-Id: Ibc87b2e88d675d4fb85b2de1778d093e4e4c2d9f
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp b/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp index af83578ef4..bde56b315c 100644 --- a/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp +++ b/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp @@ -2989,8 +2989,8 @@ TEST_P(CameraAidlTest, configureStreamsUseCases) { auto retcode = find_camera_metadata_ro_entry( staticMeta, ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES, &entry); if ((0 == retcode) && (entry.count > 0)) { - supportedUseCases.insert(supportedUseCases.end(), entry.data.i32, - entry.data.i32 + entry.count); + supportedUseCases.insert(supportedUseCases.end(), entry.data.i64, + entry.data.i64 + entry.count); } else { supportedUseCases.push_back(ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_DEFAULT); } @@ -3034,12 +3034,13 @@ TEST_P(CameraAidlTest, configureStreamsUseCases) { bool combSupported; ret = cameraDevice->isStreamCombinationSupported(config, &combSupported); - ASSERT_TRUE((ret.isOk()) || (static_cast<int32_t>(Status::OPERATION_NOT_SUPPORTED) == - ret.getServiceSpecificError())); - if (ret.isOk()) { - ASSERT_EQ(combSupported, useCaseSupported); + if (static_cast<int32_t>(Status::OPERATION_NOT_SUPPORTED) == + ret.getServiceSpecificError()) { + continue; } + ASSERT_TRUE(ret.isOk()); + ASSERT_EQ(combSupported, useCaseSupported); std::vector<HalStream> halStreams; ret = mSession->configureStreams(config, &halStreams); |