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

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

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

am: e2dae8c2

Change-Id: I396a157f3522843c3d36870719cb3e5176754dcc
parents fc73b0fc e2dae8c2

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

+3 −3
Original line number Diff line number Diff line
@@ -1527,8 +1527,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) {

    for (auto provider : CameraHidlEnvironment::Instance()->mProviders) {

        hidl_vec<hidl_string> cameraDeviceNames = getCameraDeviceNames(

                provider.second);
@@ -1547,7 +1547,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);

            }