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
This commit is contained in:
Emilian Peev
2017-08-11 10:33:22 +01:00
committed by Eino-Ville Talvala
parent e6aeacdaa1
commit e2ecbe00f0

View File

@@ -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);
}