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

Commit a9fcb4c0 authored by Zhijun He's avatar Zhijun He Committed by android-build-merger
Browse files

Merge "Camera: Update service test for multiple vendor providers" into oc-dev 

am: d1b4d0a6

Change-Id: I49d7a5a45598eaa1c8771350c5d0a0ec2a88686b
parents 86ab29e0 d1b4d0a6

services/camera/libcameraservice/tests/CameraProviderManagerTest.cpp

+3 −3
Original line number Diff line number Diff line
@@ -352,12 +352,12 @@ TEST(CameraProviderManagerTest, MultipleVendorTagTest) { 
    metadataCopy.update(ANDROID_CONTROL_SCENE_MODE, &sceneMode, 1);

    // However appending from same vendor tag provider should be fine

    ASSERT_EQ(OK, metadata.append(secondMetadata));

    // Append from a metadata without vendor tag provider should not be supported

    // Append from a metadata without vendor tag provider should be supported

    CameraMetadata regularMetadata(10, 20);

    uint8_t controlMode = ANDROID_CONTROL_MODE_AUTO;

    regularMetadata.update(ANDROID_CONTROL_MODE, &controlMode, 1);

    ASSERT_NE(OK, secondMetadata.append(regularMetadata));

    ASSERT_EQ(1u, secondMetadata.entryCount());

    ASSERT_EQ(OK, secondMetadata.append(regularMetadata));

    ASSERT_EQ(2u, secondMetadata.entryCount());

    ASSERT_EQ(2u, metadata.entryCount());



    // Dump