commit fe8f3a8e89908f9bc4b26d285ff242870557a51d
author Emilian Peev <epeev@google.com> Tue Aug 15 20:33:44 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 15 20:33:44 2017 +0000
tree d37374fd98b2216488283e0612c46dcefed845ed
parent 390ba0a0337dc2ea54154126b27331793ae8fad6
parent 4fa40be5ef86cd4b702e410857e91b938df9cd8c

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

Change-Id: I9a628c55a78651550f663b28eb2ddff0c08cde25

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 3b9d35c..6f04efc 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);
             }