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

Commit e2ecbe00 authored by Emilian Peev's avatar Emilian Peev Committed by Eino-Ville Talvala
Browse files

Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP' 

Calls to 'cancelPicture' should be no-ops in case image capture
is not active.

Bug: 64569316
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --primary-abi-only --module
VtsHalCameraProviderV2_4Target -l INFO
Change-Id: I5fad0a5b7aafd208c3a1b2f62a2b9046cde858d1
parent e6aeacda

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

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

    }

}

}





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

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

TEST_F(CameraHidlTest, cancelPictureFail) {

TEST_F(CameraHidlTest, cancelPictureNOP) {

    hidl_vec<hidl_string> cameraDeviceNames = getCameraDeviceNames(mProvider);

    hidl_vec<hidl_string> cameraDeviceNames = getCameraDeviceNames(mProvider);





    for (const auto& name : cameraDeviceNames) {

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




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

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

            ASSERT_TRUE(returnStatus.isOk());

            ASSERT_TRUE(returnStatus.isOk());

            ASSERT_NE(Status::OK, returnStatus);

            ASSERT_EQ(Status::OK, returnStatus);





            stopPreviewAndClose(device1);

            stopPreviewAndClose(device1);

        }

        }