| commit | 2d4d4d325a43c19b3af705dae0c6271342629bff | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Jan 09 12:48:06 2025 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 09 12:48:06 2025 -0800 |
| tree | bbaa4443f4b1aa6167880da349035747e2577722 | |
| parent | d04059ddf6bf1795a629280cef9e113362530c8a [diff] | |
| parent | cff297e0ab6ccdd0b4609d6fcb3fcf0fe7d76996 [diff] |
Merge "Update vts test to support automotive devices" into android14-tests-dev am: b80d9677c5 am: 3d027a90ad am: cff297e0ab Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3221604 Change-Id: I3b904fd79c00376b3923c9010cf277ab45f4884c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp index 339a142..12ee730 100644 --- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp +++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
@@ -8140,7 +8140,7 @@ ANDROID_LENS_POSE_REFERENCE, &entry); if (0 == retcode && entry.count > 0) { uint8_t poseReference = entry.data.u8[0]; - ASSERT_TRUE(poseReference <= ANDROID_LENS_POSE_REFERENCE_UNDEFINED && + ASSERT_TRUE(poseReference <= ANDROID_LENS_POSE_REFERENCE_AUTOMOTIVE && poseReference >= ANDROID_LENS_POSE_REFERENCE_PRIMARY_CAMERA); }
diff --git a/camera/provider/aidl/vts/camera_aidl_test.cpp b/camera/provider/aidl/vts/camera_aidl_test.cpp index bc8dae1..c52fe86 100644 --- a/camera/provider/aidl/vts/camera_aidl_test.cpp +++ b/camera/provider/aidl/vts/camera_aidl_test.cpp
@@ -656,8 +656,8 @@ retcode = find_camera_metadata_ro_entry(metadata, ANDROID_LENS_POSE_REFERENCE, &entry); if (0 == retcode && entry.count > 0) { uint8_t poseReference = entry.data.u8[0]; - ASSERT_TRUE(poseReference <= ANDROID_LENS_POSE_REFERENCE_UNDEFINED && - poseReference >= ANDROID_LENS_POSE_REFERENCE_PRIMARY_CAMERA); + ASSERT_TRUE(poseReference <= ANDROID_LENS_POSE_REFERENCE_AUTOMOTIVE && + poseReference >= ANDROID_LENS_POSE_REFERENCE_PRIMARY_CAMERA); } retcode =