From: Emilian Peev <epeev@google.com>
Date: Fri, 11 Aug 2017 09:33:22 +0000 (+0100)
Subject: Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'
X-Git-Url: http://git.sourceforge.jp/view?a=commitdiff_plain;h=be959695e3d73a13e744f872accbafb9c46389a4;p=android-x86%2Fhardware-interfaces.git

Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'

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

Merged-In: I5fad0a5b7aafd208c3a1b2f62a2b9046cde858d1
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
---

diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
index c0cd180c..2673afdd 100644
--- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
+++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
@@ -1526,8 +1526,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);
@@ -1546,7 +1546,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);
             }