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

Commit 2d4d4d32 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update vts test to support automotive devices" into android14-tests-dev... 

Merge "Update vts test to support automotive devices" into android14-tests-dev am: b80d9677 am: 3d027a90 am: cff297e0

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3221604



Change-Id: I3b904fd79c00376b3923c9010cf277ab45f4884c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d04059dd cff297e0

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

+1 −1
Original line number Diff line number Diff line
@@ -8140,7 +8140,7 @@ void CameraHidlTest::verifyCameraCharacteristics(Status status, const CameraMeta 
            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);

    }

camera/provider/aidl/vts/camera_aidl_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -656,7 +656,7 @@ void CameraAidlTest::verifyCameraCharacteristics(const CameraMetadata& chars) { 
    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 &&

        ASSERT_TRUE(poseReference <= ANDROID_LENS_POSE_REFERENCE_AUTOMOTIVE &&

                poseReference >= ANDROID_LENS_POSE_REFERENCE_PRIMARY_CAMERA);

    }