commit 4fa40be5ef86cd4b702e410857e91b938df9cd8c
author Emilian Peev <epeev@google.com> Tue Aug 15 20:27:50 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 15 20:27:50 2017 +0000
tree a14909095f42d6180b7ec96118d597774acf40a3
parent f5da927e197d2b0e371495bc4c5397fec758668d
parent e2dae8c2581172001f16a88ad555c401e6b42d34

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

Change-Id: If093cdfdb9ea0a327a5e67dc0dd40facc466de5c

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

diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
index 0fc53e2..a8abe11 100644
--- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
+++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
@@ -1527,8 +1527,8 @@
     }
 }
 
-// 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 @@
 
                 Return<Status> returnStatus = device1->cancelPicture();
                 ASSERT_TRUE(returnStatus.isOk());
-                ASSERT_NE(Status::OK, returnStatus);
+                ASSERT_EQ(Status::OK, returnStatus);
 
                 stopPreviewAndClose(device1);
             }