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

Commit d20434bf authored by Emilian Peev's avatar Emilian Peev Committed by android-build-merger
Browse files

Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-mr1-dev 

am: fc371311

Change-Id: If8cb5a802d75353e116b4debd3a4b7f304fd8eea
parents 6a18b403 fc371311

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

+3 −3
Original line number Diff line number Diff line
@@ -1417,8 +1417,8 @@ TEST_F(CameraHidlTest, cancelPicture) { 
    }

}



// Image capture cancel should fail when image capture is not running.

TEST_F(CameraHidlTest, cancelPictureFail) {

// Image capture cancel is a no-op when image capture is not running.

TEST_F(CameraHidlTest, cancelPictureNOP) {

    hidl_vec<hidl_string> cameraDeviceNames = getCameraDeviceNames(mProvider);



    for (const auto& name : cameraDeviceNames) {
@@ -1433,7 +1433,7 @@ TEST_F(CameraHidlTest, cancelPictureFail) { 


            Return<Status> returnStatus = device1->cancelPicture();

            ASSERT_TRUE(returnStatus.isOk());

            ASSERT_NE(Status::OK, returnStatus);

            ASSERT_EQ(Status::OK, returnStatus);



            stopPreviewAndClose(device1);

        }